diff --git a/tests/wpt/metadata/FileAPI/url/cross-global-revoke.sub.html.ini b/tests/wpt/metadata/FileAPI/url/cross-global-revoke.sub.html.ini
deleted file mode 100644
index 3a23d6ab73f9..000000000000
--- a/tests/wpt/metadata/FileAPI/url/cross-global-revoke.sub.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[cross-global-revoke.sub.html]
-  expected: TIMEOUT
-  [It is possible to revoke same-origin blob URLs from different frames.]
-    expected: TIMEOUT
-
-  [It is not possible to revoke cross-origin blob URLs.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/FileAPI/url/unicode-origin.sub.html.ini b/tests/wpt/metadata/FileAPI/url/unicode-origin.sub.html.ini
index c1a1d86ee472..05e435db5693 100644
--- a/tests/wpt/metadata/FileAPI/url/unicode-origin.sub.html.ini
+++ b/tests/wpt/metadata/FileAPI/url/unicode-origin.sub.html.ini
@@ -1,5 +1,4 @@
 [unicode-origin.sub.html]
-  expected: TIMEOUT
   [Verify serialization of non-ascii origin in Blob URLs]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/FileAPI/url/url-lifetime.html.ini b/tests/wpt/metadata/FileAPI/url/url-lifetime.html.ini
index 394324d9fea6..0d9250b97415 100644
--- a/tests/wpt/metadata/FileAPI/url/url-lifetime.html.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-lifetime.html.ini
@@ -1,8 +1,7 @@
 [url-lifetime.html]
-  expected: TIMEOUT
   [Terminating worker revokes its URLs]
     expected: FAIL
 
   [Removing an iframe revokes its URLs]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/css/CSS2/floats/floats-in-table-caption-001.html.ini b/tests/wpt/metadata/css/CSS2/floats/floats-in-table-caption-001.html.ini
deleted file mode 100644
index 86715ffc9c20..000000000000
--- a/tests/wpt/metadata/css/CSS2/floats/floats-in-table-caption-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[floats-in-table-caption-001.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/line-height-204.html.ini b/tests/wpt/metadata/css/CSS2/visudet/line-height-204.html.ini
new file mode 100644
index 000000000000..3d28990c2831
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/line-height-204.html.ini
@@ -0,0 +1,2 @@
+[line-height-204.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini
new file mode 100644
index 000000000000..fb5b6fd00069
--- /dev/null
+++ b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-paragraph.html.ini
@@ -0,0 +1,2 @@
+[mix-blend-mode-paragraph.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini b/tests/wpt/metadata/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
new file mode 100644
index 000000000000..f20284a53962
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/background-repeat/background-repeat-round-roundup.xht.ini
@@ -0,0 +1,2 @@
+[background-repeat-round-roundup.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-normal-018.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-normal-018.xht.ini
deleted file mode 100644
index 693999d7f9de..000000000000
--- a/tests/wpt/metadata/css/css-text/line-break/line-break-normal-018.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-normal-018.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018.xht.ini b/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018.xht.ini
deleted file mode 100644
index bd79bd226f90..000000000000
--- a/tests/wpt/metadata/css/css-text/line-break/line-break-strict-018.xht.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[line-break-strict-018.xht]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-001.html.ini b/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-001.html.ini
deleted file mode 100644
index ded993140ebc..000000000000
--- a/tests/wpt/metadata/css/css-text/text-transform/text-transform-full-size-kana-001.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[text-transform-full-size-kana-001.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-004.html.ini b/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-004.html.ini
deleted file mode 100644
index 240d1283c3a2..000000000000
--- a/tests/wpt/metadata/css/css-text/white-space/trailing-ideographic-space-004.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[trailing-ideographic-space-004.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-text/word-break/word-break-keep-all-006.html.ini b/tests/wpt/metadata/css/css-text/word-break/word-break-keep-all-006.html.ini
new file mode 100644
index 000000000000..3a512b4a1244
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/word-break/word-break-keep-all-006.html.ini
@@ -0,0 +1,2 @@
+[word-break-keep-all-006.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309ba..000000000000
--- a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
index 23f053f4f4a2..6f0664e678fd 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -2,3 +2,6 @@
   [The root element is the last element returned for valid queries]
     expected: FAIL
 
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/custom-elements/parser/parser-sets-attributes-and-children.html.ini b/tests/wpt/metadata/custom-elements/parser/parser-sets-attributes-and-children.html.ini
index b49624917dfd..b6001e8bba91 100644
--- a/tests/wpt/metadata/custom-elements/parser/parser-sets-attributes-and-children.html.ini
+++ b/tests/wpt/metadata/custom-elements/parser/parser-sets-attributes-and-children.html.ini
@@ -1,2 +1,2 @@
 [parser-sets-attributes-and-children.html]
-  expected: TIMEOUT
+  expected: CRASH
diff --git a/tests/wpt/metadata/fetch/sec-metadata/iframe.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/sec-metadata/iframe.tentative.https.sub.html.ini
index e54c3f843dc7..79dbd81b4577 100644
--- a/tests/wpt/metadata/fetch/sec-metadata/iframe.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/sec-metadata/iframe.tentative.https.sub.html.ini
@@ -1,11 +1,10 @@
 [iframe.tentative.https.sub.html]
-  expected: TIMEOUT
   [Same-origin iframe]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Same-site iframe]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Cross-site iframe]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/sec-metadata/xslt.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/sec-metadata/xslt.tentative.https.sub.html.ini
index 569ed0b3546d..c07bd4dac168 100644
--- a/tests/wpt/metadata/fetch/sec-metadata/xslt.tentative.https.sub.html.ini
+++ b/tests/wpt/metadata/fetch/sec-metadata/xslt.tentative.https.sub.html.ini
@@ -1,2 +1,10 @@
 [xslt.tentative.https.sub.html]
-  expected: TIMEOUT
+  [Same-Origin xslt]
+    expected: FAIL
+
+  [Cross-site xslt]
+    expected: FAIL
+
+  [Same-site xslt]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
index e0e97f1c6b12..f5118b7d9f56 100644
--- a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
@@ -8,7 +8,7 @@
     expected: FAIL
 
   [Embedded credentials are treated as network errors in new windows.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Embedded credentials matching the top-level are not treated as network errors for relative URLs.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/006.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/006.html.ini
new file mode 100644
index 000000000000..c85443610681
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/006.html.ini
@@ -0,0 +1,4 @@
+[006.html]
+  [Link with onclick form submit and href navigation ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_feature_policy.tentative.sub.html.ini b/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_feature_policy.tentative.sub.html.ini
index 310f1af3ccfd..fc9081cad228 100644
--- a/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_feature_policy.tentative.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_feature_policy.tentative.sub.html.ini
@@ -1,11 +1,4 @@
 [document_domain_feature_policy.tentative.sub.html]
-  expected: TIMEOUT
-  [Default "document-domain" feature policy ["*"\] allows cross-origin iframes.]
-    expected: TIMEOUT
-
-  [Default "document-domain" feature policy ["*"\] allows same-origin iframes.]
-    expected: TIMEOUT
-
   [Feature policy "document-domain" can be disabled in cross-origin iframes using "allow" attribute.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_null.tentative.html.ini b/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_null.tentative.html.ini
index da01e02fc552..64ca3ef9d8d5 100644
--- a/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_null.tentative.html.ini
+++ b/tests/wpt/metadata/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_null.tentative.html.ini
@@ -1,15 +1,14 @@
 [document_domain_setter_null.tentative.html]
   type: testharness
-  expected: TIMEOUT
   [Access allowed with no 'document.domain' modification. (Sanity check)]
-    expected: TIMEOUT
+    expected: FAIL
 
   [No access when frame sets a `null` 'document.domain'.]
-    expected: NOTRUN
+    expected: FAIL
 
   [No access when parent sets a `null` 'document.domain'.]
-    expected: NOTRUN
+    expected: FAIL
 
   [No access when both sides set a `null` 'document.domain'.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
index 14e2d7593e40..a70e9dbad4d8 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-height.html.ini
@@ -3,3 +3,30 @@
   [HTML: window.open `features`: non-integer values for feature `height`]
     expected: FAIL
 
+  [features "height=405*3" should set "height=405"]
+    expected: FAIL
+
+  [features "height=405.32" should set "height=405"]
+    expected: FAIL
+
+  [features "height=405e1" should set "height=405"]
+    expected: FAIL
+
+  [features "height=405/5" should set "height=405"]
+    expected: FAIL
+
+  [features "height=405^4" should set "height=405"]
+    expected: FAIL
+
+  [features "height=405.5" should set "height=405"]
+    expected: FAIL
+
+  [features "height=405e-1" should set "height=405"]
+    expected: FAIL
+
+  [features "height=405  " should set "height=405"]
+    expected: FAIL
+
+  [features "height=405LLl" should set "height=405"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
index fed8fba4a3d1..779531b4a989 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerheight.html.ini
@@ -3,3 +3,30 @@
   [HTML: window.open `features`: non-integer values for legacy feature `innerheight`]
     expected: FAIL
 
+  [features "innerheight=405e-1" should set "height=405"]
+    expected: FAIL
+
+  [features "innerheight=405LLl" should set "height=405"]
+    expected: FAIL
+
+  [features "innerheight=405^4" should set "height=405"]
+    expected: FAIL
+
+  [features "innerheight=405e1" should set "height=405"]
+    expected: FAIL
+
+  [features "innerheight=405  " should set "height=405"]
+    expected: FAIL
+
+  [features "innerheight=405/5" should set "height=405"]
+    expected: FAIL
+
+  [features "innerheight=405.32" should set "height=405"]
+    expected: FAIL
+
+  [features "innerheight=405.5" should set "height=405"]
+    expected: FAIL
+
+  [features "innerheight=405*3" should set "height=405"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
index 8b35ad53d15d..7a1b258d52e7 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-innerwidth.html.ini
@@ -3,3 +3,30 @@
   [HTML: window.open `features`: non-integer values for legacy feature `innerwidth`]
     expected: FAIL
 
+  [features "innerwidth=405e-1" should set "width=405"]
+    expected: FAIL
+
+  [features "innerwidth=405*3" should set "width=405"]
+    expected: FAIL
+
+  [features "innerwidth=405.5" should set "width=405"]
+    expected: FAIL
+
+  [features "innerwidth=405e1" should set "width=405"]
+    expected: FAIL
+
+  [features "innerwidth=405.32" should set "width=405"]
+    expected: FAIL
+
+  [features "innerwidth=405  " should set "width=405"]
+    expected: FAIL
+
+  [features "innerwidth=405LLl" should set "width=405"]
+    expected: FAIL
+
+  [features "innerwidth=405/5" should set "width=405"]
+    expected: FAIL
+
+  [features "innerwidth=405^4" should set "width=405"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
index 64bf0a8d3457..caba4124f0b4 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-left.html.ini
@@ -3,3 +3,30 @@
   [HTML: window.open `features`: non-integer values for feature `left`]
     expected: FAIL
 
+  [features "left=105e1" should set "left=105"]
+    expected: FAIL
+
+  [features "left=105  " should set "left=105"]
+    expected: FAIL
+
+  [features "left=105/5" should set "left=105"]
+    expected: FAIL
+
+  [features "left=105e-1" should set "left=105"]
+    expected: FAIL
+
+  [features "left=105^4" should set "left=105"]
+    expected: FAIL
+
+  [features "left=105LLl" should set "left=105"]
+    expected: FAIL
+
+  [features "left=105.32" should set "left=105"]
+    expected: FAIL
+
+  [features "left=105*3" should set "left=105"]
+    expected: FAIL
+
+  [features "left=105.5" should set "left=105"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
index d6c76d5a5500..9ace8a4cbdbb 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screenx.html.ini
@@ -3,3 +3,30 @@
   [HTML: window.open `features`: non-integer values for legacy feature `screenx`]
     expected: FAIL
 
+  [features "screenx=105.5" should set "left=105"]
+    expected: FAIL
+
+  [features "screenx=105e1" should set "left=105"]
+    expected: FAIL
+
+  [features "screenx=105  " should set "left=105"]
+    expected: FAIL
+
+  [features "screenx=105*3" should set "left=105"]
+    expected: FAIL
+
+  [features "screenx=105e-1" should set "left=105"]
+    expected: FAIL
+
+  [features "screenx=105^4" should set "left=105"]
+    expected: FAIL
+
+  [features "screenx=105LLl" should set "left=105"]
+    expected: FAIL
+
+  [features "screenx=105/5" should set "left=105"]
+    expected: FAIL
+
+  [features "screenx=105.32" should set "left=105"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
index bf6d1eb3fedb..a82bd0f981ac 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-screeny.html.ini
@@ -3,3 +3,30 @@
   [HTML: window.open `features`: non-integer values for legacy feature `screeny`]
     expected: FAIL
 
+  [features "screeny=405^4" should set "height=405"]
+    expected: FAIL
+
+  [features "screeny=405e-1" should set "height=405"]
+    expected: FAIL
+
+  [features "screeny=405LLl" should set "height=405"]
+    expected: FAIL
+
+  [features "screeny=405e1" should set "height=405"]
+    expected: FAIL
+
+  [features "screeny=405  " should set "height=405"]
+    expected: FAIL
+
+  [features "screeny=405/5" should set "height=405"]
+    expected: FAIL
+
+  [features "screeny=405*3" should set "height=405"]
+    expected: FAIL
+
+  [features "screeny=405.32" should set "height=405"]
+    expected: FAIL
+
+  [features "screeny=405.5" should set "height=405"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-top.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-top.html.ini
index 252d8d533634..10f617db69e0 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-top.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-top.html.ini
@@ -3,3 +3,30 @@
   [HTML: window.open `features`: non-integer values for feature `top`]
     expected: FAIL
 
+  [features "top=105/5" should set "top=105"]
+    expected: FAIL
+
+  [features "top=105*3" should set "top=105"]
+    expected: FAIL
+
+  [features "top=105LLl" should set "top=105"]
+    expected: FAIL
+
+  [features "top=105e-1" should set "top=105"]
+    expected: FAIL
+
+  [features "top=105.32" should set "top=105"]
+    expected: FAIL
+
+  [features "top=105e1" should set "top=105"]
+    expected: FAIL
+
+  [features "top=105  " should set "top=105"]
+    expected: FAIL
+
+  [features "top=105^4" should set "top=105"]
+    expected: FAIL
+
+  [features "top=105.5" should set "top=105"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
index 3cdeaa950313..28f93ee71b5d 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/open-features-non-integer-width.html.ini
@@ -3,3 +3,30 @@
   [HTML: window.open `features`: non-integer values for feature `width`]
     expected: FAIL
 
+  [features "width=405^4" should set "width=405"]
+    expected: FAIL
+
+  [features "width=405.5" should set "width=405"]
+    expected: FAIL
+
+  [features "width=405e1" should set "width=405"]
+    expected: FAIL
+
+  [features "width=405  " should set "width=405"]
+    expected: FAIL
+
+  [features "width=405.32" should set "width=405"]
+    expected: FAIL
+
+  [features "width=405LLl" should set "width=405"]
+    expected: FAIL
+
+  [features "width=405*3" should set "width=405"]
+    expected: FAIL
+
+  [features "width=405e-1" should set "width=405"]
+    expected: FAIL
+
+  [features "width=405/5" should set "width=405"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html.ini b/tests/wpt/metadata/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html.ini
index be860915fb53..8bdf0f7bd08d 100644
--- a/tests/wpt/metadata/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/nested-browsing-contexts/frameElement.sub.html.ini
@@ -1,11 +1,7 @@
 [frameElement.sub.html]
-  expected: TIMEOUT
   [The window's frameElement attribute must return its container element if it is a nested browsing context]
     expected: FAIL
 
   [The SecurityError must be thrown if the window accesses to frameElement attribute of a Window which does not have the same effective script origin]
     expected: FAIL
 
-  [The window's frameElement attribute must return null if the container's document does not have the same effective script origin]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/html/browsers/windows/targeting-with-embedded-null-in-target.html.ini b/tests/wpt/metadata/html/browsers/windows/targeting-with-embedded-null-in-target.html.ini
deleted file mode 100644
index ddddc94574b0..000000000000
--- a/tests/wpt/metadata/html/browsers/windows/targeting-with-embedded-null-in-target.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[targeting-with-embedded-null-in-target.html]
-  [Targeting with embedded null in target]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/dom/interfaces.https.html.ini b/tests/wpt/metadata/html/dom/interfaces.https.html.ini
index 18d6ddab4c41..e3cb5d2775db 100644
--- a/tests/wpt/metadata/html/dom/interfaces.https.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.https.html.ini
@@ -6792,9 +6792,6 @@
   [HTMLMediaElement interface: document.createElement("video") must inherit property "controls" with the proper type]
     expected: FAIL
 
-  [HTMLMediaElement interface: document.createElement("video") must inherit property "volume" with the proper type]
-    expected: PASS
-
   [HTMLMediaElement interface: document.createElement("video") must inherit property "muted" with the proper type]
     expected: FAIL
 
@@ -6837,9 +6834,6 @@
   [HTMLMediaElement interface: document.createElement("audio") must inherit property "controls" with the proper type]
     expected: FAIL
 
-  [HTMLMediaElement interface: document.createElement("audio") must inherit property "volume" with the proper type]
-    expected: PASS
-
   [HTMLMediaElement interface: document.createElement("audio") must inherit property "muted" with the proper type]
     expected: FAIL
 
@@ -6882,9 +6876,6 @@
   [HTMLMediaElement interface: new Audio() must inherit property "controls" with the proper type]
     expected: FAIL
 
-  [HTMLMediaElement interface: new Audio() must inherit property "volume" with the proper type]
-    expected: PASS
-
   [HTMLMediaElement interface: new Audio() must inherit property "muted" with the proper type]
     expected: FAIL
 
@@ -7005,9 +6996,6 @@
   [HTMLMediaElement interface: attribute controls]
     expected: FAIL
 
-  [HTMLMediaElement interface: attribute volume]
-    expected: PASS
-
   [HTMLMediaElement interface: attribute muted]
     expected: FAIL
 
@@ -10730,9 +10718,6 @@
   [ImageBitmap interface: operation close()]
     expected: FAIL
 
-  [MessageEvent interface: attribute source]
-    expected: FAIL
-
   [MessageEvent interface: attribute ports]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-2.html.ini
index 438eaaa18bdd..f5edfc063134 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_top_navigation-2.html.ini
@@ -3,6 +3,3 @@
   [Check that sandboxed iframe cannot perform navigation on the top\n           frame when allow-top-navigation is not set]
     expected: FAIL
 
-  [Frames without `allow-top-navigation` should not be able to navigate the top frame.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index f42f518d257d..fc37df7e3fa1 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index 2cda2cc95adc..c6f45be1eb28 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 3f7e3e9544f1..9df1ac56f2ac 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
deleted file mode 100644
index 8cc42056d34e..000000000000
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[non-active-document.html]
-  [DOMParser]
-    expected: FAIL
-
-  [createHTMLDocument]
-    expected: FAIL
-
-  [<template>]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
new file mode 100644
index 000000000000..bcd2fd0eab80
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/execution-timing/077.html.ini
@@ -0,0 +1,4 @@
+[077.html]
+  [ adding several types of scripts through the DOM and removing some of them confuses scheduler ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js.ini
index 516317bf910c..da4c074ea0ae 100644
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js.ini
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-origin.sub.window.js.ini
@@ -12,6 +12,3 @@
   [document.open should throw a SecurityError with cross-origin document even when the ignore-opens-during-unload counter is greater than 0 (during pagehide event)]
     expected: FAIL
 
-  [document.open should throw a SecurityError with cross-origin document even when there is an active parser executing script]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini
index 2314441517b5..25f0d603b3d9 100644
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini
@@ -9,6 +9,3 @@
   [document.open should throw an InvalidStateError with XML document even when the ignore-opens-during-unload counter is greater than 0 (during pagehide event)]
     expected: FAIL
 
-  [document.open should throw an InvalidStateError with XML document even when there is an active parser executing script]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-synchronous-script.window.js.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-synchronous-script.window.js.ini
deleted file mode 100644
index 02eeed3e9806..000000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-side-effects-synchronous-script.window.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[bailout-side-effects-synchronous-script.window.html]
-  [document.open bailout should not have any side effects (active parser whose script nesting level is greater than 0)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/child-css/processing-instruction.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/child-css/processing-instruction.html.ini
index bd67d76de680..31dee7759d10 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/child-css/processing-instruction.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/child-css/processing-instruction.html.ini
@@ -1,5 +1,4 @@
 [processing-instruction.html]
-  expected: ERROR
   [Child css via a ProcessingInstruction.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/font-face/external-import-stylesheet.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/font-face/external-import-stylesheet.html.ini
index 7be8b09026ed..6f8bd4fb4c1a 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/font-face/external-import-stylesheet.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/font-face/external-import-stylesheet.html.ini
@@ -1,5 +1,4 @@
 [external-import-stylesheet.html]
-  expected: ERROR
   [Font from imported stylesheet (external).]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/font-face/internal-import-stylesheet.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/font-face/internal-import-stylesheet.html.ini
index 6efde85d6e13..550cbb57ec48 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/font-face/internal-import-stylesheet.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/font-face/internal-import-stylesheet.html.ini
@@ -1,5 +1,4 @@
 [internal-import-stylesheet.html]
-  expected: ERROR
   [Font from imported stylesheet (internal).]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/font-face/processing-instruction.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/font-face/processing-instruction.html.ini
index 1cc22cb19c93..c802cc51c87f 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/font-face/processing-instruction.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/font-face/processing-instruction.html.ini
@@ -1,5 +1,4 @@
 [processing-instruction.html]
-  expected: ERROR
   [Font from external stylesheet (from ProcessingInstruction).]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/image/external-import-stylesheet.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/image/external-import-stylesheet.html.ini
index 7d0239907316..3947c4bd5d34 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/image/external-import-stylesheet.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/image/external-import-stylesheet.html.ini
@@ -1,5 +1,4 @@
 [external-import-stylesheet.html]
-  expected: ERROR
   [Image from imported stylesheet (external).]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/image/external-stylesheet.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/image/external-stylesheet.html.ini
index b4de37cfc88e..35ebea3b6675 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/image/external-stylesheet.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/image/external-stylesheet.html.ini
@@ -1,5 +1,4 @@
 [external-stylesheet.html]
-  expected: ERROR
   [Image from external stylesheet.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/image/inline-style.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/image/inline-style.html.ini
index d9ca80637be1..4abab75b6ee3 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/image/inline-style.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/image/inline-style.html.ini
@@ -1,5 +1,4 @@
 [inline-style.html]
-  expected: ERROR
   [Image from inline styles.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/image/internal-import-stylesheet.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/image/internal-import-stylesheet.html.ini
index 49c440b6e369..e51a1d73dd58 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/image/internal-import-stylesheet.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/image/internal-import-stylesheet.html.ini
@@ -1,5 +1,4 @@
 [internal-import-stylesheet.html]
-  expected: ERROR
   [Image from imported stylesheet (internal).]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/image/internal-stylesheet.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/image/internal-stylesheet.html.ini
index 38a9b9d0cee7..3c3bef0aea4f 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/image/internal-stylesheet.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/image/internal-stylesheet.html.ini
@@ -1,5 +1,4 @@
 [internal-stylesheet.html]
-  expected: ERROR
   [Image from internal stylesheet.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/image/processing-instruction.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/image/processing-instruction.html.ini
index aee0cff4d78d..7bfd99a9fe8e 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/image/processing-instruction.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/image/processing-instruction.html.ini
@@ -1,5 +1,4 @@
 [processing-instruction.html]
-  expected: ERROR
   [Image from external stylesheet (from ProcessingInstruction).]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/svg/external-stylesheet.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/svg/external-stylesheet.html.ini
index bd05a0aeae6c..7454221a982b 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/svg/external-stylesheet.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/svg/external-stylesheet.html.ini
@@ -1,8 +1,28 @@
 [external-stylesheet.html]
-  expected: ERROR
   [Test styling SVG from external style fill]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Test styling SVG from external style stroke]
-    expected: NOTRUN
+    expected: FAIL
+
+  [Test styling SVG from external style mask]
+    expected: FAIL
+
+  [Test styling SVG from external style marker-start]
+    expected: FAIL
+
+  [Test styling SVG from external style filter]
+    expected: FAIL
+
+  [Test styling SVG from external style clip-path]
+    expected: FAIL
+
+  [Test styling SVG from external style marker-end]
+    expected: FAIL
+
+  [Test styling SVG from external style marker-mid]
+    expected: FAIL
+
+  [Test styling SVG from external style mask-image]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/svg/inline-style.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/svg/inline-style.html.ini
index 5e40b913aee5..9f42e4c52b35 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/svg/inline-style.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/svg/inline-style.html.ini
@@ -1,8 +1,28 @@
 [inline-style.html]
-  expected: ERROR
   [Styling SVG from inline styles stroke]
-    expected: NOTRUN
+    expected: FAIL
 
   [Styling SVG from inline styles fill]
-    expected: TIMEOUT
+    expected: FAIL
+
+  [Styling SVG from inline styles marker-start]
+    expected: FAIL
+
+  [Styling SVG from inline styles mask-image]
+    expected: FAIL
+
+  [Styling SVG from inline styles filter]
+    expected: FAIL
+
+  [Styling SVG from inline styles marker-mid]
+    expected: FAIL
+
+  [Styling SVG from inline styles clip-path]
+    expected: FAIL
+
+  [Styling SVG from inline styles mask]
+    expected: FAIL
+
+  [Styling SVG from inline styles marker-end]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/svg/internal-stylesheet.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/svg/internal-stylesheet.html.ini
index b712b6a26dbc..16681ff4d293 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/svg/internal-stylesheet.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/svg/internal-stylesheet.html.ini
@@ -1,8 +1,28 @@
 [internal-stylesheet.html]
-  expected: ERROR
   [Styling SVG from internal styles stroke]
-    expected: NOTRUN
+    expected: FAIL
 
   [Styling SVG from internal styles fill]
-    expected: TIMEOUT
+    expected: FAIL
+
+  [Styling SVG from internal styles clip-path]
+    expected: FAIL
+
+  [Styling SVG from internal styles marker-mid]
+    expected: FAIL
+
+  [Styling SVG from internal styles mask-image]
+    expected: FAIL
+
+  [Styling SVG from internal styles marker-end]
+    expected: FAIL
+
+  [Styling SVG from internal styles filter]
+    expected: FAIL
+
+  [Styling SVG from internal styles marker-start]
+    expected: FAIL
+
+  [Styling SVG from internal styles mask]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/svg/presentation-attribute.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/svg/presentation-attribute.html.ini
index b784877e27b4..b5bb3f6a4e67 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/svg/presentation-attribute.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/svg/presentation-attribute.html.ini
@@ -1,8 +1,25 @@
 [presentation-attribute.html]
-  expected: ERROR
   [Styling SVG from presentation attributes fill]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Styling SVG from presentation attributes stroke]
-    expected: NOTRUN
+    expected: FAIL
+
+  [Styling SVG from presentation attributes marker-start]
+    expected: FAIL
+
+  [Styling SVG from presentation attributes filter]
+    expected: FAIL
+
+  [Styling SVG from presentation attributes mask]
+    expected: FAIL
+
+  [Styling SVG from presentation attributes marker-end]
+    expected: FAIL
+
+  [Styling SVG from presentation attributes marker-mid]
+    expected: FAIL
+
+  [Styling SVG from presentation attributes clip-path]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/css-integration/svg/processing-instruction.html.ini b/tests/wpt/metadata/referrer-policy/css-integration/svg/processing-instruction.html.ini
index d2a1cee7ab7f..0a95e8057cc5 100644
--- a/tests/wpt/metadata/referrer-policy/css-integration/svg/processing-instruction.html.ini
+++ b/tests/wpt/metadata/referrer-policy/css-integration/svg/processing-instruction.html.ini
@@ -1,8 +1,28 @@
 [processing-instruction.html]
-  expected: ERROR
   [Styling SVG from ProcessingInstruction stroke]
-    expected: NOTRUN
+    expected: FAIL
 
   [Styling SVG from ProcessingInstruction fill]
-    expected: TIMEOUT
+    expected: FAIL
+
+  [Styling SVG from ProcessingInstruction mask-image]
+    expected: FAIL
+
+  [Styling SVG from ProcessingInstruction marker-end]
+    expected: FAIL
+
+  [Styling SVG from ProcessingInstruction marker-mid]
+    expected: FAIL
+
+  [Styling SVG from ProcessingInstruction clip-path]
+    expected: FAIL
+
+  [Styling SVG from ProcessingInstruction marker-start]
+    expected: FAIL
+
+  [Styling SVG from ProcessingInstruction filter]
+    expected: FAIL
+
+  [Styling SVG from ProcessingInstruction mask]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/generic/multiple-headers-and-values.html.ini b/tests/wpt/metadata/referrer-policy/generic/multiple-headers-and-values.html.ini
index 4df9a4d0412d..56d9de818680 100644
--- a/tests/wpt/metadata/referrer-policy/generic/multiple-headers-and-values.html.ini
+++ b/tests/wpt/metadata/referrer-policy/generic/multiple-headers-and-values.html.ini
@@ -1,5 +1,4 @@
 [multiple-headers-and-values.html]
-  expected: ERROR
   [Image uses the last recognized Referrer-Policy header value]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/generic/multiple-headers-combined.html.ini b/tests/wpt/metadata/referrer-policy/generic/multiple-headers-combined.html.ini
index 0e47f489cad7..aaf29b0a6f83 100644
--- a/tests/wpt/metadata/referrer-policy/generic/multiple-headers-combined.html.ini
+++ b/tests/wpt/metadata/referrer-policy/generic/multiple-headers-combined.html.ini
@@ -1,5 +1,4 @@
 [multiple-headers-combined.html]
-  expected: ERROR
   [Image uses the last recognized Referrer-Policy header value]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/generic/multiple-headers-one-invalid.html.ini b/tests/wpt/metadata/referrer-policy/generic/multiple-headers-one-invalid.html.ini
index 91c799571938..b22d17ff5fd7 100644
--- a/tests/wpt/metadata/referrer-policy/generic/multiple-headers-one-invalid.html.ini
+++ b/tests/wpt/metadata/referrer-policy/generic/multiple-headers-one-invalid.html.ini
@@ -1,5 +1,4 @@
 [multiple-headers-one-invalid.html]
-  expected: ERROR
   [Referrer policy header parsing fails if one header is invalid]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/generic/multiple-headers-one-unknown-token.html.ini b/tests/wpt/metadata/referrer-policy/generic/multiple-headers-one-unknown-token.html.ini
index 76a07734079a..7b0e197c0e09 100644
--- a/tests/wpt/metadata/referrer-policy/generic/multiple-headers-one-unknown-token.html.ini
+++ b/tests/wpt/metadata/referrer-policy/generic/multiple-headers-one-unknown-token.html.ini
@@ -1,5 +1,4 @@
 [multiple-headers-one-unknown-token.html]
-  expected: ERROR
   [Image uses last recognized referrer policy token from Referrer-Policy headers]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/generic/multiple-headers.html.ini b/tests/wpt/metadata/referrer-policy/generic/multiple-headers.html.ini
index afc2a5814b8b..fe6d7dca03b5 100644
--- a/tests/wpt/metadata/referrer-policy/generic/multiple-headers.html.ini
+++ b/tests/wpt/metadata/referrer-policy/generic/multiple-headers.html.ini
@@ -1,5 +1,4 @@
 [multiple-headers.html]
-  expected: ERROR
   [Image uses the last recognized Referrer-Policy header]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini b/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
index ee7dd2382423..d76c9d0e9b4c 100644
--- a/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
+++ b/tests/wpt/metadata/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html.ini
@@ -2,8 +2,8 @@
   type: testharness
   expected: TIMEOUT
   [Sandboxed iframe with opaque origin doesn't send referrers.]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [Sandboxed iframe with tuple origin sends referrers.]
-    expected: NOTRUN
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/referrer-policy/generic/subresource-test/area-navigate.html.ini b/tests/wpt/metadata/referrer-policy/generic/subresource-test/area-navigate.html.ini
new file mode 100644
index 000000000000..042abab164a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/subresource-test/area-navigate.html.ini
@@ -0,0 +1,5 @@
+[area-navigate.html]
+  expected: TIMEOUT
+  [Area is responding with HTTP headers]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html.ini b/tests/wpt/metadata/referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html.ini
new file mode 100644
index 000000000000..649d6fa091da
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html.ini
@@ -0,0 +1,4 @@
+[attr-referrer-invalid-value.html]
+  [Invalid referrerpolicy values not reflected]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/subresource-test/fetch-messaging.html.ini b/tests/wpt/metadata/referrer-policy/generic/subresource-test/fetch-messaging.html.ini
new file mode 100644
index 000000000000..e27fb9cae420
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/subresource-test/fetch-messaging.html.ini
@@ -0,0 +1,4 @@
+[fetch-messaging.html]
+  [Fetch is responding with HTTP headers]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/subresource-test/iframe-messaging.html.ini b/tests/wpt/metadata/referrer-policy/generic/subresource-test/iframe-messaging.html.ini
new file mode 100644
index 000000000000..705e027e2f71
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/subresource-test/iframe-messaging.html.ini
@@ -0,0 +1,4 @@
+[iframe-messaging.html]
+  [Iframe is responding with HTTP headers]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/subresource-test/image-decoding.html.ini b/tests/wpt/metadata/referrer-policy/generic/subresource-test/image-decoding.html.ini
new file mode 100644
index 000000000000..82310798a0be
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/subresource-test/image-decoding.html.ini
@@ -0,0 +1,4 @@
+[image-decoding.html]
+  [Image is encoding headers as JSON.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/subresource-test/link-navigate.html.ini b/tests/wpt/metadata/referrer-policy/generic/subresource-test/link-navigate.html.ini
new file mode 100644
index 000000000000..ccba6c8e2bb4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/subresource-test/link-navigate.html.ini
@@ -0,0 +1,4 @@
+[link-navigate.html]
+  [Link is responding with HTTP headers]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/subresource-test/script-messaging.html.ini b/tests/wpt/metadata/referrer-policy/generic/subresource-test/script-messaging.html.ini
new file mode 100644
index 000000000000..fb9d7cc9db7c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/subresource-test/script-messaging.html.ini
@@ -0,0 +1,4 @@
+[script-messaging.html]
+  [Script is responding with HTTP headers]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/subresource-test/worker-messaging.html.ini b/tests/wpt/metadata/referrer-policy/generic/subresource-test/worker-messaging.html.ini
new file mode 100644
index 000000000000..e1e6e4f06fb4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/subresource-test/worker-messaging.html.ini
@@ -0,0 +1,4 @@
+[worker-messaging.html]
+  [Worker is responding with HTTP headers]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/subresource-test/xhr-messaging.html.ini b/tests/wpt/metadata/referrer-policy/generic/subresource-test/xhr-messaging.html.ini
new file mode 100644
index 000000000000..616b6b0bc39f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/subresource-test/xhr-messaging.html.ini
@@ -0,0 +1,4 @@
+[xhr-messaging.html]
+  [XHR is responding with HTTP headers]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/generic/unsupported-csp-referrer-directive.html.ini b/tests/wpt/metadata/referrer-policy/generic/unsupported-csp-referrer-directive.html.ini
new file mode 100644
index 000000000000..06261c29e6ce
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/unsupported-csp-referrer-directive.html.ini
@@ -0,0 +1,4 @@
+[unsupported-csp-referrer-directive.html]
+  [Image has a referrer despite CSP 'referrer' directive]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..87fbd96db78a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..2b9742971980
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..0c4f84e8644b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..069b8be2307f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..82a572ef1200
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..2259abf9a22d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..1792e253c542
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..bd331a127bfa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..f9da898e2fd5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..bc53e18c7e22
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..6c4ee499a2e0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..9103b128296a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..a011497f5940
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..05ea6871cbc4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..2b97fa6f3a0f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..ccc6c7a68770
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
index 1f45c7de87dc..75fc6efa0e30 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..1e2b10557046
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..c44a7952d0b0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..a94808c0bd27
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index d5a937e13fff..745d0bb64719 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index af9e2528e2d8..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 451a64e2a179..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index f9907fd3130e..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 8f5357680056..f991d37bafae 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index ad61f89903c7..86ff8379e60d 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index fcaecbd32342..c0e212de63a5 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
index 5102d4f4a746..1c91b43bde1c 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..75301d8ba546
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..a85c83ce1e4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..0b9e7717c634
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
index 59d59e4c18e8..1d2cbaa78171 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
index e864e59d8a9f..3d77b5936f97 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index f01062e81afb..8ef614e6be3c 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 69e84dd03432..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index c822d13d0f83..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 019573c8a82f..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index ae35fda2a496..7b70f7ed0ae2 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 461540d4b7af..32ed8f7abd67 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 4cd5c31da63b..82354405ef01 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
index 035a7fff69b7..877c9c154036 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..7c8c727c0ffe
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..1a7723838eef
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..aff30655e2d6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..30d13a77473b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..be13ae638e34
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..9e02f98eb318
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index d969ba655b7f..1e91e32bd6ab 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index ff878a590323..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index e962d623a3c9..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 46837acc3f23..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index e36dafb1ad66..30d05813516b 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 5405cb346356..3113d29a525d 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 32527f679bd0..aa3151aa2bd5 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
index 90fecfca62bd..c9e90224a2e0 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..0f203ba305b1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..dcdd6938e5b5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..3f2404df74a2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..dde0c362dcd4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..b1faab0d4921
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..8445b82923bc
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
index d62537ae7908..20f1e63be344 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
index 6ca288b75dc4..d7137fcb5338 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index d72eb700a193..41fe83efb953 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index d53ac14b55b0..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index e014a9d13d77..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 68087f289dfc..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 3077a1bc199e..624d5f54a2d9 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index d69b619332ec..2651cd4490ec 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 7b3330e8aeb7..4339b27d57ed 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..439112ee3503
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..16b4470a9469
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..99d74f35b196
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..bccb3cdb32db
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..795e54a5121b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..b4705268ca12
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..13a283d5a57e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..9dff25609691
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..61146ccc5ef9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
similarity index 75%
rename from tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
index 54c958215f60..2c73256871c2 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
similarity index 74%
rename from tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
index 09e31437fa33..d940e520b461 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
similarity index 75%
rename from tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
index 120cd8fa6f89..b8af0d6715c9 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..e42751fc4c25
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..c7db52383e5a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..0aed44498887
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.ini
similarity index 69%
rename from tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
rename to tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.ini
index 97936575659d..6b0ed0f56799 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html.ini
similarity index 68%
rename from tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
rename to tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html.ini
index 398d6a15f1ea..3e127fe134be 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.ini
similarity index 69%
rename from tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
rename to tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.ini
index 773d735241ed..8885ec65ff5d 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..8f93add1cf86
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..28dc1f1fd164
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..c737267b2aca
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..afdaeb029ac1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..b7e680afc340
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..a63492e76c30
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..1322b786660a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..afb5b0db80c7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..54227711e464
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
similarity index 74%
rename from tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
index 670468cc39de..41542e722ce5 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
similarity index 74%
rename from tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
index dbfd64427b74..ed24efad9ba8 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
similarity index 74%
rename from tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
index dbd20329fb77..f5f4cb070a80 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..281998b3df9a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..c24ef4fbd390
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..5d838d720f40
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..9aa3e3a3d555
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..2a3f8fe98a92
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.ini
similarity index 68%
rename from tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
rename to tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.ini
index f7774d4ddc92..9326ec6edc11 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
-[same-origin-insecure.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index f219d789b8cb..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..fbac17774d1a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..95972bafd88d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..45eabe13af6f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index 93d3b87e3130..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
deleted file mode 100644
index 83386c20614e..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index 54028eff3013..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
deleted file mode 100644
index cca6b35c9c7d..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 16ab82f001b8..478fb42d0246 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index a148329cbef1..87807b9646a6 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index b04832299dd7..b60c252db750 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index 9a41889a8a64..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..3d953935c384
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..609da1769ba9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..77007abec4de
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
index e6f1c8e899d3..57493f9cc361 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
index 306c72ceb577..53ffc4133d37 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index d9d9acfb31b0..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
deleted file mode 100644
index 5a3ba1264947..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index 1cce3ecbb6fe..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
deleted file mode 100644
index 723e58e5ed17..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 92f0909d8bf8..73c6ad0e18d9 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index 8b69d28c995f..7635d70249ed 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 596f6cc3852e..c85e84b65fee 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index dc455f438895..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..cda883786f1d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..906ba24a7459
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..d37c8113ba2e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index 182c0f88dd0d..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 972bfdc60682..59cd84478326 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index b10631ae5897..69016a0dec45 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 3868e84565f6..06030d0efa1b 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index 1b852da5fd88..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..eb20cf8986e5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..42d6a9fe4bec
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..531802a660af
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
index abdbfab971de..21d8d55e2b25 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
index 905c786b1218..b8f0a898da59 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index 6ea8a687524d..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index cc63159626d3..0a2342ffc175 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index 74ccb66fc5ad..e9ff323da6d2 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 751e9c936225..efacde67120b 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..45bc75b63621
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..d9701cde32bc
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..30bfb44a234f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..910150ef5c4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..f1da7691a35e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..338d282c4ee0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..a9c4e3e4de99
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..1f6d6175e94e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..50d3dd924346
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..439131a3216b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
similarity index 58%
rename from tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
index aff8883e1e13..a037bb3512b9 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
similarity index 75%
rename from tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
index 8c67bd2b4fee..faffa4b514c5 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
similarity index 74%
rename from tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
index deb2afb49668..4fec635264dd 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
similarity index 75%
rename from tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
index 3d5f53e0d71e..9cdc9693e7ca 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..5aa995152851
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..83245c27aed5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..07f6d8b2a91f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.ini
similarity index 70%
rename from tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.ini
index 377f13e4d4b7..4f2850aa7c9a 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.ini
similarity index 69%
rename from tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.ini
index 31a5e7dfe759..af2dcc8e2ede 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.ini
similarity index 70%
rename from tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.ini
index 09a2b82f6788..15014928fd6b 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..af6cddecb4b2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..87ab073071a8
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..af466d6cdb73
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..aa694d7351d5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..7d57c8081872
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..2c401857d63f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.ini
new file mode 100644
index 000000000000..caa9a26fb795
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-downgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.ini
new file mode 100644
index 000000000000..93f76d8b2c0e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-upgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
similarity index 75%
rename from tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
index 7a9f68b1811f..4e6e58178aea 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-downgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
similarity index 75%
rename from tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
index b48f34bea63b..1fdff16de9dd 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.ini
similarity index 75%
rename from tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.ini
index d05d8de3461d..a41f95633674 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-downgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.ini
similarity index 75%
rename from tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.ini
index cb50cf7b91ae..e553b1f45639 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
similarity index 75%
rename from tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
index d9e89a836b49..381a6f836fae 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-downgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
similarity index 75%
rename from tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index 5138c146a7f9..40a3703b6fcb 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
similarity index 75%
rename from tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
index d1581a8a6e56..d123348f4389 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
new file mode 100644
index 000000000000..8a135e473757
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-downgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
new file mode 100644
index 000000000000..a8cdbf083aeb
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-upgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.ini
new file mode 100644
index 000000000000..c88184336e58
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-downgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini
new file mode 100644
index 000000000000..623d8086ba4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-upgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
new file mode 100644
index 000000000000..cbaf0257e3cb
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-downgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..439caee49690
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
new file mode 100644
index 000000000000..e9c7c70bff22
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-upgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
similarity index 70%
rename from tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
index 129d86e4d918..20a1fc7a7481 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+[same-origin-downgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
similarity index 68%
rename from tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
index 556d5880e841..eb4540f9c14f 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+[same-origin-upgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html.ini
similarity index 69%
rename from tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html.ini
index cccb177d7a1b..2eae1a954edd 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+[same-origin-downgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html.ini
similarity index 67%
rename from tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html.ini
index 7b841f3bb4ff..0bbc1873558e 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/no-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+[same-origin-upgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
similarity index 70%
rename from tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
index 4c2d875b841c..59804400fcdb 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+[same-origin-downgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
similarity index 68%
rename from tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index 46d5e9f4cd32..989d7d154ea1 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+[same-origin-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
similarity index 68%
rename from tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
rename to tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
index 46d5e9f4cd32..b10430b7a53b 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+[same-origin-upgrade.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
index 99e1d2bf3bb6..7da7c184da0f 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..e43c95851c1f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..a8ce14f89208
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..82fa1e49b57f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
index 28247d071680..2f02b6dae2a7 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
deleted file mode 100644
index 4ff94810c1a2..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
deleted file mode 100644
index 9009c22e7bd5..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
deleted file mode 100644
index c4f7aacb46b6..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
index 5db016f8aaf1..90406f95655f 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
index 9af0323d8d09..d0c7e8f20afc 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
index 097b83e6246f..156d25b56146 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
index 54dc19761b9c..c18fcf58b844 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..2b549a2d657d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..324eee67d264
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..886d579a1287
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
index 4de69d375dfe..06d48da87e12 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
index bfd0357d8645..08ac52ca6219 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.ini
index c095ea4d19e1..6fe1d307dd45 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-downgrade.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.ini
index 79613df2fc74..59d010310139 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
deleted file mode 100644
index 69427aef09be..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-downgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
deleted file mode 100644
index 2051c2adc29e..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-upgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.ini
deleted file mode 100644
index 6d1405bdeb69..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-downgrade.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-downgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.ini
deleted file mode 100644
index 9f6ee7c3e068..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/same-origin-upgrade.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-upgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
deleted file mode 100644
index 3e688445e5d9..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-downgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
deleted file mode 100644
index 90c04ccab1e1..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-insecure.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
deleted file mode 100644
index 54baa743dff8..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-upgrade.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
index bc7e037762be..d7c6b7c28adf 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-downgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
index 0ca9fb383447..1977b8a9d1ab 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.ini
index 351a25d70942..49af9170c5cf 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-downgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini
index 0d1bce95e798..87f187110470 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
index 23dc3a6ebea6..fe8fc12e3f22 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-downgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index 5ab432f8b8f0..262b52d78cd2 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
index 8988d3494d9c..2e310dddccbf 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
index e069c6c5f48c..fb9803b802a5 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..c989eb393d7a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..08495b5de4f8
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..f1db0351701f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..b90ca2245d05
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..a0f421cb3671
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..d4948fee05be
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
index bc175b4cfc09..56acd5a949a2 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
index a7643d44f5a6..844d4bfda10b 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
index 989ff69608ce..9c022f675abf 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
index 365ab674a4a2..af6e0ae6e64d 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
index 25469017c5b4..658b54a473eb 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..6973595defb5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..46f27b8ba8b7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/no-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..74d32fafb92b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..68b2ebfb09f3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..5464b78f211a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..6433d48f279d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
index 25848a3e596f..f6f8e0f6aa93 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
index a465665953b0..6ca3decba566 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.ini
index a8d27b7df6bd..8382522d2ad3 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-downgrade.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.ini
index 4016f11f20b6..d80d1b103ab2 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
index 48daaa55a8b1..1296e6d049ad 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-downgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
index 1f729438057c..4354ffd4c6c2 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.ini
index 9225ad6b9909..8bd6bf1e6e88 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-downgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini
index 4c59e9f0caab..d34cf83f45a9 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
index 99b5285e0b0f..ec999f91b789 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-downgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-downgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index a2c3f003e348..4e7a3eef8db9 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
index 120ded5cc745..540e3022ff33 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-upgrade.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-upgrade.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
index 60638d044641..aaee2624ab93 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..48b499910844
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..2acd3caa314c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..ff3b0873ab6f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..a37c1bdb29d1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..dc5a19c820b0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..56ed507caca8
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
index 3c6398daac24..7369dffa120f 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
index 83669758a139..1dce1fd37d3c 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
index f517cfb06996..08b338b00e52 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
index 70009fdfd855..66872f5439ac 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 3e58fad086c1..1ecba587f636 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index de0533f315f7..e85063ece1b7 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index da9dfba9e4ac..feec36cdfc76 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
index 86dffa949164..9bf09acfc9cf 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..85fcd5f274e5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..399e86050980
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..ccbeab8cfc58
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..75c59857d996
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..e9a5c9dcc146
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..a27fccbf77ad
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
index c0cb3034c121..5c7f0bebb64e 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
index b5084a24e519..0ae698c816be 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
index 7253ce132d39..51f40d5408e7 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
index 1408b9f2e925..410d832847fb 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index db0de496e932..aee7dc05a96b 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index d17ff73a3acb..f35e1924101d 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 9eeffb8c8e89..2d16a4435c8d 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
index ab3e5abdf994..c18666b72ba9 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..b5c8877c7bc5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..efaaac77cc2b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..f69c7d62173c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
index 92ed2068411d..589199a15f17 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
deleted file mode 100644
index e6b1a3ac001c..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index 38722f6fb354..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
deleted file mode 100644
index de31404b7fcb..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index ea6b320722c7..452e018a5f4c 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index f8e924f7769a..68faab33ad82 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index bee184990849..d68b04e403c2 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
index 839165ee5289..c5402e491970 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..d79f45ff2408
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..de30c6ca6851
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..cea22a06abef
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
index 7b2ef3e33202..3da336cd9145 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
index 7b87ae84b2c5..63c0b68975b7 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
index 00749524585f..4421b09cece7 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
deleted file mode 100644
index e2f742208f61..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index d7f567f93b18..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
deleted file mode 100644
index 31b0faf68937..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 02b560b49f28..886454b5f4f8 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index a450bbb4553e..9629d44277ba 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 7fdb2a322895..c9c0db4379b2 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
index 7c087efc5726..43668df9dfd1 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..14ea7aab1489
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..6efa4fe55f6a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..4c33138bc477
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
index 8cf4e6a0af40..e23af0dcbbc3 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index e0213c598d4f..78be5c61a3df 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index cd9d127bafa8..0971220dc409 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 52715b932b31..3d80f3aaa56e 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
index e7c78ddda816..05a28e0aab20 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..3a0166eb1003
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..64fb89c58767
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..9d599c35402d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
index 371c88ac2cfd..966eab553cef 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
index b51ee27ff238..c2aaa03946b3 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
index 97edd37ee8bb..d1db5f27fa5b 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 801c34ebcecc..fcb917d00260 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index 2ca7f87176a6..4106d830d6c5 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 222a370f9ed5..25350cd67f7b 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..d2a60cc42979
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..ca3da01e5c87
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..0349b24e52a9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..45e097d75824
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..1a87ea15b98e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
deleted file mode 100644
index 64ca2702e6ff..000000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
index cbda7a90989d..1ccbbc5b0d19 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
index fda295ff5947..95a44083aa64 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
index 65c1d8993459..f65f829d3edd 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
index 25ab5997be7e..3ae726b81bd8 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
index 1e0da84d6f0a..9e1855da025f 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
index 8b310b382d9e..38683ae372fd 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
index b9895c3716fa..af6cddecb4b2 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..d379eeab79f4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..af466d6cdb73
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..aa694d7351d5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..807b083b6d7e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index fd0be6a841e6..430663f02ba8 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index 7cb66ad248c1..8558ef6c822d 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
deleted file mode 100644
index 824b6821f215..000000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..fda310fa177f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..18ab0c8b931b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
deleted file mode 100644
index 4f9db519b8f1..000000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
deleted file mode 100644
index a376aef27f0a..000000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
deleted file mode 100644
index 20ac61c04f05..000000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/cross-origin.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
deleted file mode 100644
index 99eedaf9c498..000000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
index 53463c19d4e0..7f86af1ed85e 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
index 0996db774630..b6a4d9507366 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
index 4b3ddc78f6d5..14cf2703f9f3 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
index 54dc19761b9c..c18fcf58b844 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..2b549a2d657d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..324eee67d264
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..ebbbe4622efe
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
index 4de69d375dfe..06d48da87e12 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
index bfd0357d8645..08ac52ca6219 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
deleted file mode 100644
index 8f9ea532b3fb..000000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-insecure.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index 8b8bd551f3ad..84d11d265b71 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
deleted file mode 100644
index ef968b13dc48..000000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-origin.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..8cc514a35402
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
new file mode 100644
index 000000000000..9a519afc94cf
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-origin.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
deleted file mode 100644
index 9e4ef78de9d1..000000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/cross-origin.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.http.html]
-  expected: TIMEOUT
-  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
index 23934208be19..9484f03a5f1c 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
index 5c6326a97673..9d656d04c15e 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
index 2a4cb05e147e..f3c76a0c7422 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/cross-origin.http.html.ini
@@ -1,5 +1,4 @@
 [cross-origin.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
index 25469017c5b4..658b54a473eb 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..68b2ebfb09f3
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..5464b78f211a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
new file mode 100644
index 000000000000..948d9bfe4121
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
index 25848a3e596f..f6f8e0f6aa93 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
index a465665953b0..6ca3decba566 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
index 7de188f956c1..fe6b50d94ccd 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/same-origin-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-origin-insecure.http.html]
-  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini
index 46cdfe2967dd..1a70ea1573c2 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [cross-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..bd31e9cf80e1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..989ac7a2642f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..d723743e0e26
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..aa819e5c431e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..dd4168c5f06a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..2f46947f748b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index 05b200da5e4e..94d3491fc376 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 68d720b7f5a3..74389b27b0cf 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
index e5dd33f9bb16..a0685daa13b8 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 16efdc145a1c..5751a4716837 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 0dde2f3baeac..0bf9fca6954f 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index d4a2e6f960cd..dad4d37374e3 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 36e4fc757bd5..b81cecd001d2 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini
index 5f878687c383..ee279c1b51fc 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html.ini
new file mode 100644
index 000000000000..e65181135278
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/same-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini
new file mode 100644
index 000000000000..6c404f7a72a2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini
new file mode 100644
index 000000000000..8480cc980d0c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini
new file mode 100644
index 000000000000..6b62d24204ed
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index e37353755697..ec581bea1371 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 0801ea95262d..65fe142482c5 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
index ee8e8470e2b0..6daff26581e8 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index c2452c2c2245..511120081746 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 8b8cb62fe479..0bba0157d34b 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 384c341b9290..c72bf6b29716 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 105dcd663f27..08eac348a64d 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini
index 7fc5d20453fc..e086da6f034e 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [cross-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..0124119314a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..8c5f8590c6f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..957e39eb8502
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index a345e7a5232d..9b4554ebdae4 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index d5e312c3326e..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index fd848c0de0e7..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 82a7e2a12b9c..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 136a3a903cc6..c19c543a863a 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 20724c0898ab..3cad81eddd62 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index a323588d6cf0..4439b2307709 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini
index 932f0b84d273..c34d3fae07c0 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini
new file mode 100644
index 000000000000..505c630741f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini
new file mode 100644
index 000000000000..4fff945831dc
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini
new file mode 100644
index 000000000000..e64aec6b6560
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.ini
index 3de81abd12bd..ed7da8cfaab7 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.ini
index be9e4d965092..77dcdf3095e1 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index ea86d58d0e8a..4bfb3e7451cd 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 4011d756f19e..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 7e91bd1aa2ed..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 49af9116301f..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index d5f33297ec85..567306e2357f 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index d5932c062d9e..c02d36719e73 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 290548b04205..469ec1fdadbf 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini
index de8a642b7d68..fce950536abc 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/cross-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [cross-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..ecc437d00c2c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..4befbc3fda7f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini
new file mode 100644
index 000000000000..eb7fafab879c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/cross-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index 9760327b35f1..6f48f87a3ebf 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index be0f314031cb..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 6fa444f09da6..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 5764a5b908d9..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 696f81b7e7db..e1f5432f63b1 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 15ed53a8e88c..f1eb2130465c 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index d94dc2e41d7c..1d9a8085d696 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini
index 3633fffbd545..9175dc9426f2 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/same-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-insecure.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini
new file mode 100644
index 000000000000..3e47b4c98d82
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/same-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini
new file mode 100644
index 000000000000..89e7e0d384c9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/same-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-insecure.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini
new file mode 100644
index 000000000000..760d9b8b64bd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/same-insecure.http.html.ini
@@ -0,0 +1,4 @@
+[same-insecure.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.ini
index d65bba2d95b2..5d95b1cc4fb0 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/same-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.ini
index c0e517a9ea90..5cbfc8f5a143 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/same-insecure.http.html.ini
@@ -1,5 +1,4 @@
 [same-insecure.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index 46be4fac5400..9795c38eac3b 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 7b841f3bb4ff..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index b3db1f385959..648cff9f4d6b 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 3ba502b4a871..cd6e50dc9518 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 2658011b8f1c..6a98c62c4605 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
index d202e26ad9e8..04969dc3560d 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..55ffde1bf5ba
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..4bc374a03df1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..eb9df36e26f9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..83f7ea343663
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..d48d94724283
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..bceeeaf93670
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index 05b200da5e4e..94d3491fc376 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 68d720b7f5a3..74389b27b0cf 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
index e5dd33f9bb16..a0685daa13b8 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 16efdc145a1c..5751a4716837 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 0dde2f3baeac..0bf9fca6954f 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index d4a2e6f960cd..dad4d37374e3 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 36e4fc757bd5..b81cecd001d2 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
index 5395c7d79ec9..455a479756b9 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..eb2c8a57d1bb
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..90149286a7ad
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..cb82106d4081
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..06de8a69a0e0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..ff5f2b07583f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..7512d2570bad
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index e37353755697..ec581bea1371 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 0801ea95262d..65fe142482c5 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
index ee8e8470e2b0..6daff26581e8 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index c2452c2c2245..511120081746 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 8b8cb62fe479..0bba0157d34b 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 384c341b9290..c72bf6b29716 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 105dcd663f27..08eac348a64d 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
index 781e0b07c9d3..20bd219661eb 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..cd937dda271a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..b99e3b8e22e6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..43d40b2c831f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index a345e7a5232d..9b4554ebdae4 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index d5e312c3326e..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index fd848c0de0e7..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 82a7e2a12b9c..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 136a3a903cc6..c19c543a863a 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 20724c0898ab..3cad81eddd62 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index a323588d6cf0..4439b2307709 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
index 67468a99c33f..ea1e4eba3e2e 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..bdbc85a3dfde
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..db5326cb9092
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..cd878b2fb171
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
index a216d8f97be1..f2274160336c 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
index f535713360a8..cb62eae0cbad 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index ea86d58d0e8a..4bfb3e7451cd 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 4011d756f19e..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 7e91bd1aa2ed..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 49af9116301f..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index d5f33297ec85..567306e2357f 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index d5932c062d9e..c02d36719e73 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 290548b04205..469ec1fdadbf 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
index e274bb59532c..7c4c34e4310c 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..2c257ce2c6c4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..e985e89310c1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..0ca26e1bf83a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index 9760327b35f1..6f48f87a3ebf 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index be0f314031cb..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 6fa444f09da6..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 5764a5b908d9..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index 696f81b7e7db..e1f5432f63b1 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 15ed53a8e88c..f1eb2130465c 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index d94dc2e41d7c..1d9a8085d696 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
index 5447d527dd58..a91ea08866ab 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..a7f44c48f1c4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..0310fb926473
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..2e6c2fb6bca9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
index c2592b6f841f..991dca9d7c0b 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
index b8b017e387f0..8a1fc2eb2ac3 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [insecure-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
index 46be4fac5400..9795c38eac3b 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: TIMEOUT
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
deleted file mode 100644
index 556d5880e841..000000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[upgrade-protocol.http.html]
-  expected: TIMEOUT
-  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
index b3db1f385959..648cff9f4d6b 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
index 3ba502b4a871..cd6e50dc9518 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
index 2658011b8f1c..6a98c62c4605 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -1,5 +1,4 @@
 [upgrade-protocol.http.html]
-  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..241c2992c661
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..ae8ec23347ab
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..fdcb496294fd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..d2967631328d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..03583e915f3c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..6acf86a6147d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..c6dec68c7d98
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..96d93615f473
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..e2e1e5910d78
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..264fc89599c5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..7ae61942e44c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..daaf6eb129f1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..78a039b61870
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..2e6c73eb0c68
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..850db27c6136
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..550137b9edbe
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
index 49e56d6bd462..2f28fce0ca48 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..a53d11237388
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..e631f74251f6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..3164988cabcb
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
index 5d498c283b61..c6f650306ccb 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
deleted file mode 100644
index bc578a5251ca..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index 7f2f93ab7d05..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
deleted file mode 100644
index 7f9c7bd3c041..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 4799c25896b5..8b64318849c3 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index dbee9e53471d..e583be018abc 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 4f1e37349b01..34bf3b7081f7 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
index c55b042a8278..6eefb7e9c643 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..25c194a90c50
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..d312fb8b8946
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..0b6dc221b30b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
index 4bd973d40d3e..f96afb673671 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
index f370b4ff2147..d9053efc9b03 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
index 15b544d06a8b..4867ef3001bb 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
deleted file mode 100644
index 0392f7d757b1..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index c437578ff7c9..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
deleted file mode 100644
index f37601030b11..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 17e2f4eb75e4..0c8b03be02bb 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index 26d0578ce86c..e16b6bde6459 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 0dc504cd8484..627f6347a3c2 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
index 9481271e5764..63e74c508a10 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..7f100b454814
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..cfcdfc72619d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..278c0c64e30c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..79e18d4337d0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..697c7999c497
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..953235934b5b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
index fadbd61af8a7..68885afa7578 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
deleted file mode 100644
index 74ed78b8237c..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index 86f9c3153076..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
deleted file mode 100644
index 5f50db314989..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 74ec48c7cf14..fe8d7d031c9c 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index 33332fe9b61a..da22a55fa45f 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index 9d9ac103fbe5..a4ac6a12cf9f 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
index 45d8913c7239..af7f2e087ca3 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..fbe06659a538
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..86bcec54d61a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..7429d6c00270
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..d669a7c933e0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..5d82d1d692b8
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/no-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
new file mode 100644
index 000000000000..98e3f7a73367
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -0,0 +1,4 @@
+[generic.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
index 12010fa637eb..d9c3038a8db2 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
index fa2b694c2c81..a3a4b98a10c4 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/shared-worker/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
index 4149d01d5f92..70959ee90ce7 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/a-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: TIMEOUT
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
deleted file mode 100644
index 95c35b054081..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/keep-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
deleted file mode 100644
index 95845e3b7e0c..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/no-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
deleted file mode 100644
index dc44467e2b7a..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/swap-origin-redirect/generic.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.http.html]
-  expected: TIMEOUT
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
index 3d4a02c50482..a7fbc07c2c5f 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
index 423733f8d8bf..8bec8fec14f1 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/no-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
index c75654d3c05a..cbb62e79567e 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/generic.http.html.ini
@@ -1,5 +1,4 @@
 [generic.http.html]
-  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..87fbd96db78a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..2b9742971980
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..0c4f84e8644b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..069b8be2307f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..82a572ef1200
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..2259abf9a22d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..1792e253c542
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..bd331a127bfa
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..f9da898e2fd5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..bc53e18c7e22
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..6c4ee499a2e0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..9103b128296a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..a011497f5940
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..05ea6871cbc4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..2b97fa6f3a0f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..ccc6c7a68770
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..75fc6efa0e30
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..23fb2f0e2156
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..a9d14d7c37df
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..75ddef372f81
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..1e2b10557046
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..c44a7952d0b0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..a94808c0bd27
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..745d0bb64719
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..caed3c280dae
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..c9f2d9a2df57
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..33d12116ea0b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..f991d37bafae
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..86ff8379e60d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..c0e212de63a5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..1c91b43bde1c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..7f27d13053fd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..e453af3d9b6a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..31b29c11c9dd
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..75301d8ba546
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..a85c83ce1e4d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..0b9e7717c634
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..0a89b6c7637d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via module-worker using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..7d7b3c47f1a4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via module-worker using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..1d2cbaa78171
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..3d77b5936f97
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..384e46126219
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via worker-request using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..dc070973604b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via worker-request using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..8ef614e6be3c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..1c9028cce271
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..17cc40feab4a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..1c713b886c63
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..7b70f7ed0ae2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..32ed8f7abd67
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..82354405ef01
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..877c9c154036
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..7c8c727c0ffe
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..1a7723838eef
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..aff30655e2d6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..30d13a77473b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..be13ae638e34
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..9e02f98eb318
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..1e91e32bd6ab
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..f93e4ef1448b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..36e30ba69921
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..7e00df7995a4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..30d05813516b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..3113d29a525d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..aa3151aa2bd5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..c9e90224a2e0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..0f203ba305b1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..dcdd6938e5b5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..3f2404df74a2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/fetch-request/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..dde0c362dcd4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..b1faab0d4921
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..8445b82923bc
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/img-tag/swap-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..4579d20a6886
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via module-worker using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..d1f76008abe4
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/module-worker/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via module-worker using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..20f1e63be344
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..d7137fcb5338
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/shared-worker/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via shared-worker using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..b25e2d2d8803
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/keep-origin-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via worker-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.ini
new file mode 100644
index 000000000000..a2a5cffd1d56
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/worker-request/no-redirect/insecure-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via worker-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..41fe83efb953
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/a-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via a-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..23da34b0cd5d
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..08898f89895c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..8982fb1a9fa7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/fetch-request/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via fetch-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..624d5f54a2d9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/keep-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..2651cd4490ec
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/no-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
new file mode 100644
index 000000000000..4339b27d57ed
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/img-tag/swap-origin-redirect/upgrade-protocol.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.http.html]
+  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webvr/webvr-disabled-by-feature-policy.https.sub.html.ini b/tests/wpt/metadata/webvr/webvr-disabled-by-feature-policy.https.sub.html.ini
index a55dd4fa48d8..ee0ea805ca0b 100644
--- a/tests/wpt/metadata/webvr/webvr-disabled-by-feature-policy.https.sub.html.ini
+++ b/tests/wpt/metadata/webvr/webvr-disabled-by-feature-policy.https.sub.html.ini
@@ -1,11 +1,10 @@
 [webvr-disabled-by-feature-policy.https.sub.html]
-  expected: TIMEOUT
   [Feature-Policy header vr "none" disallows the top-level document.]
     expected: FAIL
 
   [Feature-Policy header vr "none" disallows same-origin iframes.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Feature-Policy header vr "none" disallows cross-origin iframes.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/webvr/webvr-enabled-by-feature-policy.https.sub.html.ini b/tests/wpt/metadata/webvr/webvr-enabled-by-feature-policy.https.sub.html.ini
deleted file mode 100644
index 8a363f316bd7..000000000000
--- a/tests/wpt/metadata/webvr/webvr-enabled-by-feature-policy.https.sub.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[webvr-enabled-by-feature-policy.https.sub.html]
-  expected: TIMEOUT
-  [Feature-Policy header vr * allows same-origin iframes.]
-    expected: TIMEOUT
-
-  [Feature-Policy header vr * allows cross-origin iframes.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html.ini b/tests/wpt/metadata/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html.ini
index bb968ef6d8d3..29450885a681 100644
--- a/tests/wpt/metadata/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html.ini
+++ b/tests/wpt/metadata/webvr/webvr-enabled-on-self-origin-by-feature-policy.https.sub.html.ini
@@ -1,8 +1,4 @@
 [webvr-enabled-on-self-origin-by-feature-policy.https.sub.html]
-  expected: TIMEOUT
-  [Feature-Policy header vr "self" allows same-origin iframes.]
-    expected: TIMEOUT
-
   [Feature-Policy header vr "self" disallows cross-origin iframes.]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/xhr/xmlhttprequest-sync-default-feature-policy.sub.html.ini b/tests/wpt/metadata/xhr/xmlhttprequest-sync-default-feature-policy.sub.html.ini
index 52e7f0fcea55..e76c77300bc9 100644
--- a/tests/wpt/metadata/xhr/xmlhttprequest-sync-default-feature-policy.sub.html.ini
+++ b/tests/wpt/metadata/xhr/xmlhttprequest-sync-default-feature-policy.sub.html.ini
@@ -1,11 +1,4 @@
 [xmlhttprequest-sync-default-feature-policy.sub.html]
-  expected: TIMEOUT
-  [Default "sync-xhr" feature policy ["*"\] allows same-origin iframes.]
-    expected: TIMEOUT
-
-  [Default "sync-xhr" feature policy ["*"\] allows cross-origin iframes.]
-    expected: TIMEOUT
-
   [Feature policy "sync-xhr" can be disabled in cross-origin iframes using "allow" attribute.]
     expected: FAIL