Auto merge of #22514 - jdm:source, r=Manishearth

Implement source for postMessage events

Also make similar-origin iframes access their newly loaded document as soon as the new document is created. This should allow tests that check the event.source property to run correctly.

---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #22499 and fix #12715 and fix #22514.
- [x] There are tests for these changes

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22514)
<!-- Reviewable:end -->

919 files changed, 2740 insertions, 1909 deletions

diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index 9ca2b758bff..80214a67a99 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -1279,8 +1279,13 @@ where
                     warn!("constellation got set final url message for dead pipeline");
                 }
             },
-            FromScriptMsg::PostMessage(browsing_context_id, origin, data) => {
-                self.handle_post_message_msg(browsing_context_id, origin, data);
+            FromScriptMsg::PostMessage {
+                target: browsing_context_id,
+                source: source_pipeline_id,
+                target_origin: origin,
+                data,
+            } => {
+                self.handle_post_message_msg(browsing_context_id, source_pipeline_id, origin, data);
             },
             FromScriptMsg::Focus => {
                 self.handle_focus_msg(source_pipeline_id);
@@ -2844,6 +2849,7 @@ where
     fn handle_post_message_msg(
         &mut self,
         browsing_context_id: BrowsingContextId,
+        source_pipeline: PipelineId,
         origin: Option<ImmutableOrigin>,
         data: Vec<u8>,
     ) {
@@ -2856,7 +2862,17 @@ where
             },
             Some(browsing_context) => browsing_context.pipeline_id,
         };
-        let msg = ConstellationControlMsg::PostMessage(pipeline_id, origin, data);
+        let source_browsing_context = match self.pipelines.get(&source_pipeline) {
+            Some(pipeline) => pipeline.top_level_browsing_context_id,
+            None => return warn!("PostMessage from closed pipeline {:?}", source_pipeline),
+        };
+        let msg = ConstellationControlMsg::PostMessage {
+            target: pipeline_id,
+            source: source_pipeline,
+            source_browsing_context: source_browsing_context,
+            target_origin: origin,
+            data,
+        };
         let result = match self.pipelines.get(&pipeline_id) {
             Some(pipeline) => pipeline.event_loop.send(msg),
             None => return warn!("postMessage to closed pipeline {}.", pipeline_id),
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs
index edcb07cd4a1..92e26bad353 100644
--- a/components/script/dom/dedicatedworkerglobalscope.rs
+++ b/components/script/dom/dedicatedworkerglobalscope.rs
@@ -424,7 +424,7 @@ impl DedicatedWorkerGlobalScope {
                     JSAutoCompartment::new(scope.get_cx(), scope.reflector().get_jsobject().get());
                 rooted!(in(scope.get_cx()) let mut message = UndefinedValue());
                 data.read(scope.upcast(), message.handle_mut());
-                MessageEvent::dispatch_jsval(target, scope.upcast(), message.handle(), None);
+                MessageEvent::dispatch_jsval(target, scope.upcast(), message.handle(), None, None);
             },
             WorkerScriptMsg::Common(msg) => {
                 self.upcast::<WorkerGlobalScope>().process_event(msg);
diff --git a/components/script/dom/dissimilaroriginwindow.rs b/components/script/dom/dissimilaroriginwindow.rs
index 662b65b8ef5..4814862881a 100644
--- a/components/script/dom/dissimilaroriginwindow.rs
+++ b/components/script/dom/dissimilaroriginwindow.rs
@@ -203,11 +203,12 @@ impl DissimilarOriginWindow {
             None => return warn!("postMessage called with no incumbent global"),
             Some(incumbent) => incumbent,
         };
-        let msg = ScriptMsg::PostMessage(
-            self.window_proxy.browsing_context_id(),
-            origin,
-            data.move_to_arraybuffer(),
-        );
+        let msg = ScriptMsg::PostMessage {
+            target: self.window_proxy.browsing_context_id(),
+            source: incumbent.pipeline_id(),
+            target_origin: origin,
+            data: data.move_to_arraybuffer(),
+        };
         let _ = incumbent.script_to_constellation_chan().send(msg);
     }
 }
diff --git a/components/script/dom/eventsource.rs b/components/script/dom/eventsource.rs
index 10c912fb8e4..5daaf3a5f7b 100644
--- a/components/script/dom/eventsource.rs
+++ b/components/script/dom/eventsource.rs
@@ -238,6 +238,7 @@ impl EventSourceContext {
                 false,
                 data.handle(),
                 DOMString::from(self.origin.clone()),
+                None,
                 event_source.last_event_id.borrow().clone(),
             )
         };
diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs
index 65c8203913a..edde48f95e6 100644
--- a/components/script/dom/messageevent.rs
+++ b/components/script/dom/messageevent.rs
@@ -7,24 +7,27 @@ use crate::dom::bindings::codegen::Bindings::MessageEventBinding;
 use crate::dom::bindings::codegen::Bindings::MessageEventBinding::MessageEventMethods;
 use crate::dom::bindings::error::Fallible;
 use crate::dom::bindings::inheritance::Castable;
-use crate::dom::bindings::reflector::reflect_dom_object;
-use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::reflector::{reflect_dom_object, DomObject};
+use crate::dom::bindings::root::{Dom, DomRoot};
 use crate::dom::bindings::str::DOMString;
 use crate::dom::bindings::trace::RootedTraceableBox;
 use crate::dom::event::Event;
 use crate::dom::eventtarget::EventTarget;
 use crate::dom::globalscope::GlobalScope;
+use crate::dom::windowproxy::WindowProxy;
 use dom_struct::dom_struct;
-use js::jsapi::{Heap, JSContext};
+use js::jsapi::{Heap, JSContext, JSObject};
 use js::jsval::JSVal;
 use js::rust::HandleValue;
 use servo_atoms::Atom;
+use std::ptr::NonNull;
 
 #[dom_struct]
 pub struct MessageEvent {
     event: Event,
     data: Heap<JSVal>,
     origin: DOMString,
+    source: Option<Dom<WindowProxy>>,
     lastEventId: DOMString,
 }
 
@@ -34,6 +37,7 @@ impl MessageEvent {
             global,
             HandleValue::undefined(),
             DOMString::new(),
+            None,
             DOMString::new(),
         )
     }
@@ -42,12 +46,14 @@ impl MessageEvent {
         global: &GlobalScope,
         data: HandleValue,
         origin: DOMString,
+        source: Option<&WindowProxy>,
         lastEventId: DOMString,
     ) -> DomRoot<MessageEvent> {
         let ev = Box::new(MessageEvent {
             event: Event::new_inherited(),
             data: Heap::default(),
             origin: origin,
+            source: source.map(Dom::from_ref),
             lastEventId: lastEventId,
         });
         let ev = reflect_dom_object(ev, global, MessageEventBinding::Wrap);
@@ -63,9 +69,10 @@ impl MessageEvent {
         cancelable: bool,
         data: HandleValue,
         origin: DOMString,
+        source: Option<&WindowProxy>,
         lastEventId: DOMString,
     ) -> DomRoot<MessageEvent> {
-        let ev = MessageEvent::new_initialized(global, data, origin, lastEventId);
+        let ev = MessageEvent::new_initialized(global, data, origin, source, lastEventId);
         {
             let event = ev.upcast::<Event>();
             event.init_event(type_, bubbles, cancelable);
@@ -78,6 +85,10 @@ impl MessageEvent {
         type_: DOMString,
         init: RootedTraceableBox<MessageEventBinding::MessageEventInit>,
     ) -> Fallible<DomRoot<MessageEvent>> {
+        let source = init
+            .source
+            .as_ref()
+            .and_then(|inner| inner.as_ref().map(|source| source.window_proxy()));
         let ev = MessageEvent::new(
             global,
             Atom::from(type_),
@@ -85,6 +96,7 @@ impl MessageEvent {
             init.parent.cancelable,
             init.data.handle(),
             init.origin.clone(),
+            source.as_ref().map(|source| &**source),
             init.lastEventId.clone(),
         );
         Ok(ev)
@@ -97,6 +109,7 @@ impl MessageEvent {
         scope: &GlobalScope,
         message: HandleValue,
         origin: Option<&str>,
+        source: Option<&WindowProxy>,
     ) {
         let messageevent = MessageEvent::new(
             scope,
@@ -105,6 +118,7 @@ impl MessageEvent {
             false,
             message,
             DOMString::from(origin.unwrap_or("")),
+            source,
             DOMString::new(),
         );
         messageevent.upcast::<Event>().fire(target);
@@ -123,6 +137,14 @@ impl MessageEventMethods for MessageEvent {
         self.origin.clone()
     }
 
+    // https://html.spec.whatwg.org/multipage/#dom-messageevent-source
+    #[allow(unsafe_code)]
+    unsafe fn GetSource(&self, _cx: *mut JSContext) -> Option<NonNull<JSObject>> {
+        self.source
+            .as_ref()
+            .and_then(|source| NonNull::new(source.reflector().get_jsobject().get()))
+    }
+
     // https://html.spec.whatwg.org/multipage/#dom-messageevent-lasteventid
     fn LastEventId(&self) -> DOMString {
         self.lastEventId.clone()
diff --git a/components/script/dom/webidls/MessageEvent.webidl b/components/script/dom/webidls/MessageEvent.webidl
index 1fa4c924901..c2ef9732096 100644
--- a/components/script/dom/webidls/MessageEvent.webidl
+++ b/components/script/dom/webidls/MessageEvent.webidl
@@ -8,6 +8,8 @@ interface MessageEvent : Event {
   readonly attribute any data;
   readonly attribute DOMString origin;
   readonly attribute DOMString lastEventId;
+  // FIXME(#22617): WindowProxy is not exposed in Worker globals
+  readonly attribute object? source;
   //readonly attribute (WindowProxy or MessagePort)? source;
   //readonly attribute MessagePort[]? ports;
 };
@@ -17,6 +19,7 @@ dictionary MessageEventInit : EventInit {
   DOMString origin = "";
   DOMString lastEventId = "";
   //DOMString channel;
+  Window? source;
   //(WindowProxy or MessagePort)? source;
   //sequence<MessagePort> ports;
 };
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 4344078a017..d03e168e3a1 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -599,6 +599,7 @@ impl TaskOnce for MessageReceivedTask {
                 &global,
                 message.handle(),
                 Some(&ws.origin().ascii_serialization()),
+                None,
             );
         }
     }
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 2993a95456a..bcda545a8cb 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -859,14 +859,13 @@ impl WindowMethods for Window {
         message: HandleValue,
         origin: DOMString,
     ) -> ErrorResult {
+        let source_global = GlobalScope::incumbent().expect("no incumbent global??");
+        let source = source_global.as_window();
+
         // Step 3-5.
         let origin = match &origin[..] {
             "*" => None,
-            "/" => {
-                // TODO(#12715): Should be the origin of the incumbent settings
-                //               object, not self's.
-                Some(self.Document().origin().immutable().clone())
-            },
+            "/" => Some(source.Document().origin().immutable().clone()),
             url => match ServoUrl::parse(&url) {
                 Ok(url) => Some(url.origin().clone()),
                 Err(_) => return Err(Error::Syntax),
@@ -878,7 +877,7 @@ impl WindowMethods for Window {
         let data = StructuredCloneData::write(cx, message)?;
 
         // Step 9.
-        self.post_message(origin, data);
+        self.post_message(origin, &*source.window_proxy(), data);
         Ok(())
     }
 
@@ -2194,11 +2193,14 @@ impl Window {
     pub fn post_message(
         &self,
         target_origin: Option<ImmutableOrigin>,
+        source: &WindowProxy,
         serialize_with_transfer_result: StructuredCloneData,
     ) {
         let this = Trusted::new(self);
+        let source = Trusted::new(source);
         let task = task!(post_serialised_message: move || {
             let this = this.root();
+            let source = source.root();
 
             // Step 7.1.
             if let Some(target_origin) = target_origin {
@@ -2226,7 +2228,8 @@ impl Window {
                 this.upcast(),
                 this.upcast(),
                 message_clone.handle(),
-                None
+                None,
+                Some(&*source),
             );
         });
         // FIXME(nox): Why are errors silenced here?
diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs
index 7135e969c0e..aeabbeb2645 100644
--- a/components/script/dom/worker.rs
+++ b/components/script/dom/worker.rs
@@ -140,7 +140,7 @@ impl Worker {
         let _ac = JSAutoCompartment::new(global.get_cx(), target.reflector().get_jsobject().get());
         rooted!(in(global.get_cx()) let mut message = UndefinedValue());
         data.read(&global, message.handle_mut());
-        MessageEvent::dispatch_jsval(target, &global, message.handle(), None);
+        MessageEvent::dispatch_jsval(target, &global, message.handle(), None, None);
     }
 
     pub fn dispatch_simple_error(address: TrustedWorkerAddress) {
diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
index 6114e353d97..9247ca6afba 100644
--- a/components/script/script_thread.rs
+++ b/components/script/script_thread.rs
@@ -1419,7 +1419,7 @@ impl ScriptThread {
                     ChangeFrameVisibilityStatus(id, ..) => Some(id),
                     NotifyVisibilityChange(id, ..) => Some(id),
                     Navigate(id, ..) => Some(id),
-                    PostMessage(id, ..) => Some(id),
+                    PostMessage { target: id, .. } => Some(id),
                     UpdatePipelineId(_, _, id, _) => Some(id),
                     UpdateHistoryState(id, ..) => Some(id),
                     RemoveHistoryStates(id, ..) => Some(id),
@@ -1592,9 +1592,19 @@ impl ScriptThread {
                 browsing_context_id,
                 visible,
             ),
-            ConstellationControlMsg::PostMessage(pipeline_id, origin, data) => {
-                self.handle_post_message_msg(pipeline_id, origin, data)
-            },
+            ConstellationControlMsg::PostMessage {
+                target: target_pipeline_id,
+                source: source_pipeline_id,
+                source_browsing_context,
+                target_origin: origin,
+                data,
+            } => self.handle_post_message_msg(
+                target_pipeline_id,
+                source_pipeline_id,
+                source_browsing_context,
+                origin,
+                data,
+            ),
             ConstellationControlMsg::UpdatePipelineId(
                 parent_pipeline_id,
                 browsing_context_id,
@@ -2080,12 +2090,33 @@ impl ScriptThread {
     fn handle_post_message_msg(
         &self,
         pipeline_id: PipelineId,
+        source_pipeline_id: PipelineId,
+        source_browsing_context: TopLevelBrowsingContextId,
         origin: Option<ImmutableOrigin>,
         data: Vec<u8>,
     ) {
         match { self.documents.borrow().find_window(pipeline_id) } {
-            None => return warn!("postMessage after pipeline {} closed.", pipeline_id),
-            Some(window) => window.post_message(origin, StructuredCloneData::Vector(data)),
+            None => return warn!("postMessage after target pipeline {} closed.", pipeline_id),
+            Some(window) => {
+                // FIXME: synchronously talks to constellation.
+                // send the required info as part of postmessage instead.
+                let source = match self.remote_window_proxy(
+                    &*window.global(),
+                    source_browsing_context,
+                    source_pipeline_id,
+                    None,
+                ) {
+                    None => {
+                        return warn!(
+                            "postMessage after source pipeline {} closed.",
+                            source_pipeline_id,
+                        );
+                    },
+                    Some(source) => source,
+                };
+                // FIXME(#22512): enqueues a task; unnecessary delay.
+                window.post_message(origin, &*source, StructuredCloneData::Vector(data))
+            },
         }
     }
 
@@ -2820,6 +2851,21 @@ impl ScriptThread {
 
         window.init_document(&document);
 
+        // For any similar-origin iframe, ensure that the contentWindow/contentDocument
+        // APIs resolve to the new window/document as soon as parsing starts.
+        if let Some(frame) = window_proxy
+            .frame_element()
+            .and_then(|e| e.downcast::<HTMLIFrameElement>())
+        {
+            let parent_pipeline = frame.global().pipeline_id();
+            self.handle_update_pipeline_id(
+                parent_pipeline,
+                window_proxy.browsing_context_id(),
+                incomplete.pipeline_id,
+                UpdatePipelineIdReason::Navigation,
+            );
+        }
+
         self.script_sender
             .send((incomplete.pipeline_id, ScriptMsg::ActivateDocument))
             .unwrap();
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs
index 788a206b63f..b97544f9223 100644
--- a/components/script_traits/lib.rs
+++ b/components/script_traits/lib.rs
@@ -284,7 +284,18 @@ pub enum ConstellationControlMsg {
     /// PipelineId is for the parent, BrowsingContextId is for the nested browsing context
     Navigate(PipelineId, BrowsingContextId, LoadData, bool),
     /// Post a message to a given window.
-    PostMessage(PipelineId, Option<ImmutableOrigin>, Vec<u8>),
+    PostMessage {
+        /// The target of the message.
+        target: PipelineId,
+        /// The source of the message.
+        source: PipelineId,
+        /// The top level browsing context associated with the source pipeline.
+        source_browsing_context: TopLevelBrowsingContextId,
+        /// The expected origin of the target.
+        target_origin: Option<ImmutableOrigin>,
+        /// The data to be posted.
+        data: Vec<u8>,
+    },
     /// Updates the current pipeline ID of a given iframe.
     /// First PipelineId is for the parent, second is the new PipelineId for the frame.
     UpdatePipelineId(
@@ -358,7 +369,7 @@ impl fmt::Debug for ConstellationControlMsg {
             ChangeFrameVisibilityStatus(..) => "ChangeFrameVisibilityStatus",
             NotifyVisibilityChange(..) => "NotifyVisibilityChange",
             Navigate(..) => "Navigate",
-            PostMessage(..) => "PostMessage",
+            PostMessage { .. } => "PostMessage",
             UpdatePipelineId(..) => "UpdatePipelineId",
             UpdateHistoryState(..) => "UpdateHistoryState",
             RemoveHistoryStates(..) => "RemoveHistoryStates",
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs
index 54b52fb33d0..a63462fd83f 100644
--- a/components/script_traits/script_msg.rs
+++ b/components/script_traits/script_msg.rs
@@ -134,7 +134,16 @@ pub enum ScriptMsg {
     /// Abort loading after sending a LoadUrl message.
     AbortLoadUrl,
     /// Post a message to the currently active window of a given browsing context.
-    PostMessage(BrowsingContextId, Option<ImmutableOrigin>, Vec<u8>),
+    PostMessage {
+        /// The target of the posted message.
+        target: BrowsingContextId,
+        /// The source of the posted message.
+        source: PipelineId,
+        /// The expected origin of the target.
+        target_origin: Option<ImmutableOrigin>,
+        /// The data to be posted.
+        data: Vec<u8>,
+    },
     /// Inform the constellation that a fragment was navigated to and whether or not it was a replacement navigation.
     NavigatedToFragment(ServoUrl, bool),
     /// HTMLIFrameElement Forward or Back traversal.
@@ -209,7 +218,7 @@ impl fmt::Debug for ScriptMsg {
             LoadComplete => "LoadComplete",
             LoadUrl(..) => "LoadUrl",
             AbortLoadUrl => "AbortLoadUrl",
-            PostMessage(..) => "PostMessage",
+            PostMessage { .. } => "PostMessage",
             NavigatedToFragment(..) => "NavigatedToFragment",
             TraverseHistory(..) => "TraverseHistory",
             PushHistoryState(..) => "PushHistoryState",
diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini
index 5eed5ef7070..5a33f9d66d1 100644
--- a/tests/wpt/include.ini
+++ b/tests/wpt/include.ini
@@ -4,7 +4,7 @@ skip: true
   [mozilla]
     skip: false
     [referrer-policy]
-      skip: true
+      skip: false
 [_webgl]
   skip: false
 [2dcontext]
@@ -106,7 +106,7 @@ skip: true
 [quirks]
   skip: false
 [referrer-policy]
-  skip: true
+  skip: false
 [resource-timing]
   skip: false
 [subresource-integrity]
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 3a23d6ab73f..00000000000
--- 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 c1a1d86ee47..05e435db569 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 394324d9fea..0d9250b9741 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/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 2341518ad75..c6994498d11 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -650092,67 +650092,67 @@
    "support"
   ],
   "referrer-policy/css-integration/child-css/external-import-stylesheet.html": [
-   "a2d3e8ced0412b97422847d4d81c1403cf9ae52c",
+   "40f4234ad48d19162cefae933fd0f53a72ff0c19",
    "testharness"
   ],
   "referrer-policy/css-integration/child-css/internal-import-stylesheet.html": [
-   "aebf5031484b799989d6b6a9dd72a5bc28575214",
+   "30c5ea2903094af38dea9a7a565255d178069178",
    "testharness"
   ],
   "referrer-policy/css-integration/child-css/processing-instruction.html": [
-   "b6333e2c7b248c3f3b863bd06f1c99abd472f162",
+   "52a0ded42a185ed5ff6f449879e0ce50f8255868",
    "testharness"
   ],
   "referrer-policy/css-integration/css-test-helper.js": [
-   "f5886dbbcbe358438dfbac45c5a0127e9e990ad4",
+   "788df16a456b83a23de662b710c200042a1e7254",
    "support"
   ],
   "referrer-policy/css-integration/font-face/external-import-stylesheet.html": [
-   "c344c56c5bf322f35e8d8c74427d80391e6637d3",
+   "80e3587ad62f040f2cfb28645437fcbc0e66b415",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/external-stylesheet.html": [
-   "24e4bb99900a556cb0b44144a25c9f8249224eb7",
+   "a91eb3fe758299229040466deb2d1b0263f77197",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/internal-import-stylesheet.html": [
-   "54e2383423cab8679635d05c256c32e27a94c024",
+   "a637082a4ce7dff612b223fc8a4c2195db300013",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/internal-stylesheet.html": [
-   "b3869bcebdcdadea3e50d7e8713c853d46ba4816",
+   "eebd864bc56725b79c1f29c0597466574e2af091",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/processing-instruction.html": [
-   "89ee918e24e14b8ea5d35a7dfaf09610eb89ee11",
+   "bfc42d9fcbe355514c7bf72ac087d7159439824e",
    "testharness"
   ],
   "referrer-policy/css-integration/image/external-import-stylesheet.html": [
-   "0023af31b17ee883e6e9fe6cdd8f09b8eacf83d1",
+   "80c71b0e215b547d664aee8757d70188c012a9c0",
    "testharness"
   ],
   "referrer-policy/css-integration/image/external-stylesheet.html": [
-   "d14769db4a1221bb6e220aa594c4a3b6bab97aa1",
+   "ba7497b97de6911c149b423bf25305123e97150e",
    "testharness"
   ],
   "referrer-policy/css-integration/image/inline-style.html": [
-   "42128ae062093c0e8feb5d90ab62a6cb281cf8e9",
+   "758b6d91852f67d4e47726815804a5e366fe534d",
    "testharness"
   ],
   "referrer-policy/css-integration/image/internal-import-stylesheet.html": [
-   "90003547f4d4e2048cc33f7125d756d42507140d",
+   "24aa1858304a2130624589b0a64c6f9ec9cac5a1",
    "testharness"
   ],
   "referrer-policy/css-integration/image/internal-stylesheet.html": [
-   "943108d66e4b273a6d3be30b2ea8a0edb0490c7b",
+   "f4567885e1f1e215487a11f1023d117517cd88b8",
    "testharness"
   ],
   "referrer-policy/css-integration/image/presentation-attribute.html": [
-   "78401d3ec16866f1e51618bdb5cb028f5eea8490",
+   "d0a4d96f84c8e48ea5daf5699c7b04bbc877ba86",
    "testharness"
   ],
   "referrer-policy/css-integration/image/processing-instruction.html": [
-   "1ca18547dd54c4707250f400999a041f16f77ddf",
+   "926147be489a85164758dcf644c715e4a5c02de6",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/external-stylesheet.html": [
@@ -650176,7 +650176,7 @@
    "testharness"
   ],
   "referrer-policy/generic/common.js": [
-   "f9bbe42b914c46822ec8b74aacd849789723dd72",
+   "a16691bccb2543ad68b81e9a16fa261d3cce6a9f",
    "support"
   ],
   "referrer-policy/generic/iframe-inheritance.html": [
@@ -650228,11 +650228,11 @@
    "support"
   ],
   "referrer-policy/generic/referrer-policy-test-case.js": [
-   "4641683cd850da86279dcd062aaf868d346aa2bd",
+   "2385cc2a1c4e51a2855299e42b69ac12362cd699",
    "support"
   ],
   "referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html": [
-   "8fee77f836378ec137c3bf0d554f4def83a5caba",
+   "1b2b12bf6910e075338462de577dc4228f52a21f",
    "testharness"
   ],
   "referrer-policy/generic/sanity-checker.js": [
@@ -650240,7 +650240,7 @@
    "support"
   ],
   "referrer-policy/generic/subresource-test/area-navigate.html": [
-   "bca7e479fa2ca41505bc73cf74c6e518efa7e947",
+   "3eb824521b7801c518a7b36218075eb3d74bd639",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html": [
@@ -650248,31 +650248,31 @@
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/fetch-messaging.html": [
-   "046b29e9a3e94753c1a552732b0f44d2883a011d",
+   "edb159d9eb1cf5eed6af249a40f70d9ecd079d68",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/iframe-messaging.html": [
-   "a3e55707c26f95624baaa54b8778d641cd756d72",
+   "606e18b281f6c3498573dc9bfaefefca1390026a",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/image-decoding.html": [
-   "448f12b1348fa77aaaebd52b2c3ee6ae9c73a5f6",
+   "9c50ea6619389dad8ad81c4c2afbeb8030b176db",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/link-navigate.html": [
-   "45e502004d4b640d0b2194e48d060b8d3cc3f120",
+   "95582f65bac8a3b478cc8cd4fe9b883fb507237f",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/script-messaging.html": [
-   "09c5db6193fed52c60edc2526609c3d501c45da8",
+   "f73f4406df20694480f82570ed8674fe283ea375",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/worker-messaging.html": [
-   "6d34366b943ad2b3b15f08179a58ef5227c675d0",
+   "fd7591882e91e7265fd740b9018248d21f13b5b9",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/xhr-messaging.html": [
-   "09f69140098a16bd66a117cf6187fedc862d9233",
+   "6ef4a9cfd4b98c3562fe7ef6e04eb931073166de",
    "testharness"
   ],
   "referrer-policy/generic/subresource/__init__.py": [
@@ -650400,7 +650400,7 @@
    "support"
   ],
   "referrer-policy/generic/unsupported-csp-referrer-directive.html": [
-   "9627d16559903b5202f842f3c3355a2e7005f65c",
+   "475efa55091778e747fa36030f7b422b89d6d4b9",
    "testharness"
   ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/a-tag/no-redirect/insecure-protocol.http.html": [
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 86715ffc9c2..00000000000
--- 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 00000000000..3d28990c283
--- /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 00000000000..fb5b6fd0006
--- /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 00000000000..f20284a5396
--- /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 693999d7f9d..00000000000
--- 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 bd79bd226f9..00000000000
--- 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 ded993140eb..00000000000
--- 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 240d1283c3a..00000000000
--- 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 00000000000..3a512b4a124
--- /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 4c79907309b..00000000000
--- a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
index 23f053f4f4a..6f0664e678f 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 b49624917df..b6001e8bba9 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 e54c3f843dc..79dbd81b457 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 569ed0b3546..c07bd4dac16 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 e0e97f1c6b1..f5118b7d9f5 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 00000000000..c8544361068
--- /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 310f1af3ccf..fc9081cad22 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 da01e02fc55..64ca3ef9d8d 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 14e2d7593e4..a70e9dbad4d 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 fed8fba4a3d..779531b4a98 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 8b35ad53d15..7a1b258d52e 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 64bf0a8d345..caba4124f0b 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 d6c76d5a550..9ace8a4cbdb 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 bf6d1eb3fed..a82bd0f981a 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 252d8d53363..10f617db69e 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 3cdeaa95031..28f93ee71b5 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 be860915fb5..8bdf0f7bd08 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 ddddc94574b..00000000000
--- 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 18d6ddab4c4..e3cb5d2775d 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 438eaaa18bd..f5edfc06313 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 f42f518d257..fc37df7e3fa 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,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 2cda2cc95ad..c6f45be1eb2 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 3f7e3e9544f..9df1ac56f2a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,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 8cc42056d34..00000000000
--- 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 00000000000..bcd2fd0eab8
--- /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 516317bf910..da4c074ea0a 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 2314441517b..25f0d603b3d 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 02eeed3e980..00000000000
--- 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 bd67d76de68..31dee7759d1 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 7be8b09026e..6f8bd4fb4c1 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 6efde85d6e1..550cbb57ec4 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 1cc22cb19c9..c802cc51c87 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 7d023990731..3947c4bd5d3 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 b4de37cfc88..35ebea3b667 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 d9ca80637be..4abab75b6ee 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 49c440b6e36..e51a1d73dd5 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 38a9b9d0cee..3c3bef0aea4 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 aee0cff4d78..7bfd99a9fe8 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 bd05a0aeae6..7454221a982 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 5e40b913aee..9f42e4c52b3 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 b712b6a26db..16681ff4d29 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 b784877e27b..b5bb3f6a4e6 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 d2a1cee7ab7..0a95e8057cc 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 4df9a4d0412..56d9de81868 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 0e47f489cad..aaf29b0a6f8 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 91c79957193..b22d17ff5fd 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 76a07734079..7b0e197c0e0 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 afc2a5814b8..fe6d7dca03b 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 ee7dd238242..d76c9d0e9b4 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/generic/subresource-test/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/generic/subresource-test/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..042abab164a
--- /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 00000000000..649d6fa091d
--- /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 00000000000..e27fb9cae42
--- /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 00000000000..705e027e2f7
--- /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 00000000000..82310798a0b
--- /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 00000000000..ccba6c8e2bb
--- /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 00000000000..fb9d7cc9db7
--- /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 00000000000..e1e6e4f06fb
--- /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 00000000000..616b6b0bc39
--- /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
index c2b0313db96..06261c29e6c 100644
--- 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
@@ -1,3 +1,4 @@
 [unsupported-csp-referrer-directive.html]
-  type: testharness
-  disabled: https://github.com/servo/servo/issues/4767
+  [Image has a referrer despite CSP 'referrer' directive]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/attr-referrer/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..87fbd96db78
--- /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 00000000000..2b974297198
--- /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 00000000000..0c4f84e8644
--- /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 00000000000..069b8be2307
--- /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 00000000000..82a572ef120
--- /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 00000000000..2259abf9a22
--- /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 00000000000..1792e253c54
--- /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 00000000000..bd331a127bf
--- /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 00000000000..f9da898e2fd
--- /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 00000000000..bc53e18c7e2
--- /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 00000000000..6c4ee499a2e
--- /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 00000000000..9103b128296
--- /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 00000000000..a011497f594
--- /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 00000000000..05ea6871cbc
--- /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 00000000000..2b97fa6f3a0
--- /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 00000000000..ccc6c7a6877
--- /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-csp/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-csp/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-csp/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 1f45c7de87d..75fc6efa0e3 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..1e2b1055704
--- /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 00000000000..c44a7952d0b
--- /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 00000000000..a94808c0bd2
--- /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 d5a937e13ff..745d0bb6471 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 af9e2528e2d..00000000000
--- 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 451a64e2a17..00000000000
--- 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 f9907fd3130..00000000000
--- 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 8f535768005..f991d37bafa 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 ad61f89903c..86ff8379e60 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 fcaecbd3234..c0e212de63a 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 5102d4f4a74..1c91b43bde1 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..75301d8ba54
--- /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 00000000000..a85c83ce1e4
--- /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 00000000000..0b9e7717c63
--- /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 59d59e4c18e..1d2cbaa7817 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 e864e59d8a9..3d77b5936f9 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 f01062e81af..8ef614e6be3 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 69e84dd0343..00000000000
--- 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 c822d13d0f8..00000000000
--- 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 019573c8a82..00000000000
--- 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 ae35fda2a49..7b70f7ed0ae 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 461540d4b7a..32ed8f7abd6 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 4cd5c31da63..82354405ef0 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-csp/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-csp/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-csp/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 035a7fff69b..877c9c15403 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..7c8c727c0ff
--- /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 00000000000..1a7723838ee
--- /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 00000000000..aff30655e2d
--- /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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..30d13a77473
--- /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 00000000000..be13ae638e3
--- /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 00000000000..9e02f98eb31
--- /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-http/script-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/script-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 d969ba655b7..1e91e32bd6a 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 ff878a59032..00000000000
--- 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 e962d623a3c..00000000000
--- 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 46837acc3f2..00000000000
--- 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 e36dafb1ad6..30d05813516 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 5405cb34635..3113d29a525 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 32527f679bd..aa3151aa2bd 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 90fecfca62b..c9e90224a2e 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..0f203ba305b
--- /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 00000000000..dcdd6938e5b
--- /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 00000000000..3f2404df74a
--- /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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..dde0c362dcd
--- /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 00000000000..b1faab0d492
--- /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 00000000000..8445b82923b
--- /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/script-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/script-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 d62537ae790..20f1e63be34 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 6ca288b75dc..d7137fcb533 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 d72eb700a19..41fe83efb95 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 d53ac14b55b..00000000000
--- 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 e014a9d13d7..00000000000
--- 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 68087f289df..00000000000
--- 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 3077a1bc199..624d5f54a2d 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 d69b619332e..2651cd4490e 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 7b3330e8aeb..4339b27d57e 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/attr-referrer/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..439112ee350
--- /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 00000000000..16b4470a946
--- /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 00000000000..99d74f35b19
--- /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 00000000000..bccb3cdb32d
--- /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 00000000000..795e54a5121
--- /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 00000000000..b4705268ca1
--- /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 00000000000..13a283d5a57
--- /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 00000000000..9dff2560969
--- /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 00000000000..61146ccc5ef
--- /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
index 54c958215f6..2c73256871c 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
index 09e31437fa3..d940e520b46 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
index 120cd8fa6f8..b8af0d6715c 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 00000000000..e42751fc4c2
--- /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 00000000000..c7db52383e5
--- /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 00000000000..0aed4449888
--- /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
index 97936575659..6b0ed0f5679 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
index 398d6a15f1e..3e127fe134b 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
index 773d735241e..8885ec65ff5 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 00000000000..8f93add1cf8
--- /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 00000000000..28dc1f1fd16
--- /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 00000000000..c737267b2ac
--- /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 00000000000..afdaeb029ac
--- /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 00000000000..b7e680afc34
--- /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 00000000000..a63492e76c3
--- /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 00000000000..1322b786660
--- /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 00000000000..afb5b0db80c
--- /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 00000000000..54227711e46
--- /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
index 670468cc39d..41542e722ce 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
index dbfd64427b7..ed24efad9ba 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
index dbd20329fb7..f5f4cb070a8 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 00000000000..281998b3df9
--- /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 00000000000..c24ef4fbd39
--- /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 00000000000..5d838d720f4
--- /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 00000000000..9aa3e3a3d55
--- /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 00000000000..2a3f8fe98a9
--- /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
index f7774d4ddc9..9326ec6edc1 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-csp/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-csp/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-csp/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 f219d789b8c..00000000000
--- 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..fbac17774d1
--- /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 00000000000..95972bafd88
--- /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 00000000000..45eabe13af6
--- /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 93d3b87e313..00000000000
--- 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 83386c20614..00000000000
--- 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 54028eff301..00000000000
--- 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 cca6b35c9c7..00000000000
--- 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 16ab82f001b..478fb42d024 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 a148329cbef..87807b9646a 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 b04832299dd..b60c252db75 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 9a41889a8a6..00000000000
--- 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..3d953935c38
--- /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 00000000000..609da1769ba
--- /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 00000000000..77007abec4d
--- /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 e6f1c8e899d..57493f9cc36 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 306c72ceb57..53ffc4133d3 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 d9d9acfb31b..00000000000
--- 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 5a3ba126494..00000000000
--- 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 1cce3ecbb6f..00000000000
--- 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 723e58e5ed1..00000000000
--- 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 92f0909d8bf..73c6ad0e18d 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 8b69d28c995..7635d70249e 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 596f6cc3852..c85e84b65fe 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-csp/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-csp/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-csp/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 dc455f43889..00000000000
--- 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/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..cda883786f1
--- /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 00000000000..906ba24a745
--- /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 00000000000..d37c8113ba2
--- /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-http/script-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/script-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 182c0f88dd0..00000000000
--- 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 972bfdc6068..59cd8447832 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 b10631ae589..69016a0dec4 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 3868e84565f..06030d0efa1 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 1b852da5fd8..00000000000
--- 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/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..eb20cf8986e
--- /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 00000000000..42d6a9fe4be
--- /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 00000000000..531802a660a
--- /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/script-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/script-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 abdbfab971d..21d8d55e2b2 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 905c786b121..b8f0a898da5 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 6ea8a687524..00000000000
--- 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 cc63159626d..0a2342ffc17 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 74ccb66fc5a..e9ff323da6d 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 751e9c93622..efacde67120 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-only/attr-referrer/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-only/attr-referrer/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/attr-referrer/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/http-csp/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-only/http-csp/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/http-csp/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-csp/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-csp/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-csp/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/script-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/script-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/script-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/script-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/script-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/script-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/attr-referrer/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..45bc75b6362
--- /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 00000000000..d9701cde32b
--- /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 00000000000..30bfb44a234
--- /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 00000000000..910150ef5c4
--- /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 00000000000..f1da7691a35
--- /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 00000000000..338d282c4ee
--- /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 00000000000..a9c4e3e4de9
--- /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 00000000000..1f6d6175e94
--- /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 00000000000..50d3dd92434
--- /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 00000000000..439131a3216
--- /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
index aff8883e1e1..a037bb3512b 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
index 8c67bd2b4fe..faffa4b514c 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
index deb2afb4966..4fec635264d 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
index 3d5f53e0d71..9cdc9693e7c 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 00000000000..5aa99515285
--- /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 00000000000..83245c27aed
--- /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 00000000000..07f6d8b2a91
--- /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
index 377f13e4d4b..4f2850aa7c9 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
index 31a5e7dfe75..af2dcc8e2ed 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
index 09a2b82f678..15014928fd6 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 00000000000..af6cddecb4b
--- /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 00000000000..87ab073071a
--- /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 00000000000..af466d6cdb7
--- /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 00000000000..aa694d7351d
--- /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 00000000000..7d57c808187
--- /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 00000000000..2c401857d63
--- /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 00000000000..caa9a26fb79
--- /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 00000000000..93f76d8b2c0
--- /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
index 7a9f68b1811..4e6e58178ae 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
index b48f34bea63..1fdff16de9d 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
index d05d8de3461..a41f9563367 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
index cb50cf7b91a..e553b1f4563 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
index d9e89a836b4..381a6f836fa 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
index 5138c146a7f..40a3703b6fc 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
index d1581a8a6e5..d123348f438 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 00000000000..8a135e47375
--- /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 00000000000..a8cdbf083ae
--- /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 00000000000..c88184336e5
--- /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 00000000000..623d8086ba4
--- /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 00000000000..cbaf0257e3c
--- /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 00000000000..439caee4969
--- /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 00000000000..e9c7c70bff2
--- /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
index 129d86e4d91..20a1fc7a748 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
index 556d5880e84..eb4540f9c14 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
index cccb177d7a1..2eae1a954ed 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
index 7b841f3bb4f..0bbc1873558 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
index 4c2d875b841..59804400fcd 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
index 46d5e9f4cd3..989d7d154ea 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
index 46d5e9f4cd3..b10430b7a53 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-csp/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-csp/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-csp/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 99e1d2bf3bb..7da7c184da0 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..e43c95851c1
--- /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 00000000000..a8ce14f8920
--- /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 00000000000..82fa1e49b57
--- /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 28247d07168..2f02b6dae2a 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 4ff94810c1a..00000000000
--- 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 9009c22e7bd..00000000000
--- 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 c4f7aacb46b..00000000000
--- 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 5db016f8aaf..90406f95655 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 9af0323d8d0..d0c7e8f20af 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 097b83e6246..156d25b5614 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 54dc19761b9..c18fcf58b84 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..2b549a2d657
--- /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 00000000000..324eee67d26
--- /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 00000000000..886d579a128
--- /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 4de69d375df..06d48da87e1 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 bfd0357d864..08ac52ca621 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 c095ea4d19e..6fe1d307dd4 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 79613df2fc7..59d01031013 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 69427aef09b..00000000000
--- 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 2051c2adc29..00000000000
--- 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 6d1405bdeb6..00000000000
--- 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 9f6ee7c3e06..00000000000
--- 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 3e688445e5d..00000000000
--- 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 90c04ccab1e..00000000000
--- 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 54baa743dff..00000000000
--- 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 bc7e037762b..d7c6b7c28ad 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 0ca9fb38344..1977b8a9d1a 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 351a25d7094..49af9170c5c 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 0d1bce95e79..87f18711047 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 23dc3a6ebea..fe8fc12e3f2 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 5ab432f8b8f..262b52d78cd 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 8988d3494d9..2e310dddccb 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-csp/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-csp/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-csp/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 e069c6c5f48..fb9803b802a 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..c989eb393d7
--- /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 00000000000..08495b5de4f
--- /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 00000000000..f1db0351701
--- /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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..b90ca2245d0
--- /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 00000000000..a0f421cb367
--- /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 00000000000..d4948fee05b
--- /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-http/script-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/script-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 bc175b4cfc0..56acd5a949a 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 a7643d44f5a..844d4bfda10 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 989ff69608c..9c022f675ab 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 365ab674a4a..af6e0ae6e64 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 25469017c5b..658b54a473e 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..6973595defb
--- /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 00000000000..46f27b8ba8b
--- /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 00000000000..74d32fafb92
--- /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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..68b2ebfb09f
--- /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 00000000000..5464b78f211
--- /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 00000000000..6433d48f279
--- /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/script-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/script-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 25848a3e596..f6f8e0f6aa9 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 a465665953b..6ca3decba56 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 a8d27b7df6b..8382522d2ad 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 4016f11f20b..d80d1b103ab 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 48daaa55a8b..1296e6d049a 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 1f729438057..4354ffd4c6c 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 9225ad6b990..8bd6bf1e6e8 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 4c59e9f0caa..d34cf83f45a 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 99b5285e0b0..ec999f91b78 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 a2c3f003e34..4e7a3eef8db 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 120ded5cc74..540e3022ff3 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 60638d04464..aaee2624ab9 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
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 00000000000..48b49991084
--- /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 00000000000..2acd3caa314
--- /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 00000000000..ff3b0873ab6
--- /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/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..a37c1bdb29d
--- /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 00000000000..dc5a19c820b
--- /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 00000000000..56ed507caca
--- /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 3c6398daac2..7369dffa120 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 83669758a13..1dce1fd37d3 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 f517cfb0699..08b338b00e5 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 70009fdfd85..66872f5439a 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 3e58fad086c..1ecba587f63 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 de0533f315f..e85063ece1b 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 da9dfba9e4a..feec36cdfc7 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 86dffa94916..9bf09acfc9c 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
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 00000000000..85fcd5f274e
--- /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 00000000000..399e8605098
--- /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 00000000000..ccbeab8cfc5
--- /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/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..75c59857d99
--- /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 00000000000..e9a5c9dcc14
--- /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 00000000000..a27fccbf77a
--- /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 c0cb3034c12..5c7f0bebb64 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 b5084a24e51..0ae698c816b 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 7253ce132d3..51f40d5408e 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 1408b9f2e92..410d832847f 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 db0de496e93..aee7dc05a96 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 d17ff73a3ac..f35e1924101 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 9eeffb8c8e8..2d16a4435c8 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 ab3e5abdf99..c18666b72ba 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..b5c8877c7bc
--- /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 00000000000..efaaac77cc2
--- /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 00000000000..f69c7d62173
--- /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 92ed2068411..589199a15f1 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 e6b1a3ac001..00000000000
--- 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 38722f6fb35..00000000000
--- 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 de31404b7fc..00000000000
--- 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 ea6b320722c..452e018a5f4 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 f8e924f7769..68faab33ad8 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 bee18499084..d68b04e403c 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 839165ee528..c5402e49197 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..d79f45ff240
--- /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 00000000000..de30c6ca685
--- /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 00000000000..cea22a06abe
--- /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 7b2ef3e3320..3da336cd914 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 7b87ae84b2c..63c0b68975b 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 00749524585..4421b09cece 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 e2f742208f6..00000000000
--- 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 d7f567f93b1..00000000000
--- 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 31b0faf6893..00000000000
--- 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 02b560b49f2..886454b5f4f 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 a450bbb4553..9629d44277b 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 7fdb2a32289..c9c0db4379b 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 7c087efc572..43668df9dfd 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..14ea7aab148
--- /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 00000000000..6efa4fe55f6
--- /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 00000000000..4c33138bc47
--- /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 8cf4e6a0af4..e23af0dcbbc 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 e0213c598d4..78be5c61a3d 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 cd9d127bafa..0971220dc40 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 52715b932b3..3d80f3aaa56 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 e7c78ddda81..05a28e0aab2 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..3a0166eb100
--- /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 00000000000..64fb89c5876
--- /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 00000000000..9d599c35402
--- /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 371c88ac2cf..966eab553ce 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 b51ee27ff23..c2aaa03946b 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 97edd37ee8b..d1db5f27fa5 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 801c34ebcec..fcb917d0026 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 2ca7f87176a..4106d830d6c 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 222a370f9ed..25350cd67f7 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
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 00000000000..d2a60cc4297
--- /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 00000000000..ca3da01e5c8
--- /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 00000000000..0349b24e52a
--- /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/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..45e097d7582
--- /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 00000000000..1a87ea15b98
--- /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 64ca2702e6f..00000000000
--- 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 cbda7a90989..1ccbbc5b0d1 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 fda295ff594..95a44083aa6 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 65c1d899345..f65f829d3ed 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 25ab5997be7..3ae726b81bd 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 1e0da84d6f0..9e1855da025 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 8b310b382d9..38683ae372f 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 b9895c3716f..af6cddecb4b 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
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 00000000000..d379eeab79f
--- /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/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..af466d6cdb7
--- /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 00000000000..aa694d7351d
--- /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 00000000000..807b083b6d7
--- /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 fd0be6a841e..430663f02ba 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 7cb66ad248c..8558ef6c822 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 824b6821f21..00000000000
--- 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..fda310fa177
--- /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 00000000000..18ab0c8b931
--- /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 4f9db519b8f..00000000000
--- 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 a376aef27f0..00000000000
--- 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 20ac61c04f0..00000000000
--- 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 99eedaf9c49..00000000000
--- 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 53463c19d4e..7f86af1ed85 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 0996db77463..b6a4d950736 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 4b3ddc78f6d..14cf2703f9f 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 54dc19761b9..c18fcf58b84 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..2b549a2d657
--- /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 00000000000..324eee67d26
--- /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 00000000000..ebbbe4622ef
--- /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 4de69d375df..06d48da87e1 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 bfd0357d864..08ac52ca621 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 8f9ea532b3f..00000000000
--- 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 8b8bd551f3a..84d11d265b7 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 ef968b13dc4..00000000000
--- 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..8cc514a3540
--- /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 00000000000..9a519afc94c
--- /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 9e4ef78de9d..00000000000
--- 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 23934208be1..9484f03a5f1 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 5c6326a9767..9d656d04c15 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 2a4cb05e147..f3c76a0c742 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 25469017c5b..658b54a473e 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..68b2ebfb09f
--- /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 00000000000..5464b78f211
--- /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 00000000000..948d9bfe412
--- /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 25848a3e596..f6f8e0f6aa9 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 a465665953b..6ca3decba56 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 7de188f956c..fe6b50d94cc 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 46cdfe2967d..1a70ea1573c 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
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 00000000000..bd31e9cf80e
--- /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 00000000000..989ac7a2642
--- /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 00000000000..d723743e0e2
--- /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/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..aa819e5c431
--- /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 00000000000..dd4168c5f06
--- /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 00000000000..2f46947f748
--- /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 05b200da5e4..94d3491fc37 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 68d720b7f5a..74389b27b0c 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 e5dd33f9bb1..a0685daa13b 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 16efdc145a1..5751a471683 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 0dde2f3baea..0bf9fca6954 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 d4a2e6f960c..dad4d37374e 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 36e4fc757bd..b81cecd001d 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 5f878687c38..ee279c1b51f 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
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 00000000000..e6518113527
--- /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/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..6c404f7a72a
--- /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 00000000000..8480cc980d0
--- /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 00000000000..6b62d24204e
--- /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 e3735375569..ec581bea137 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 0801ea95262..65fe142482c 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 ee8e8470e2b..6daff26581e 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 c2452c2c224..51112008174 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 8b8cb62fe47..0bba0157d34 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 384c341b929..c72bf6b2971 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 105dcd663f2..08eac348a64 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 7fc5d20453f..e086da6f034 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..0124119314a
--- /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 00000000000..8c5f8590c6f
--- /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 00000000000..957e39eb850
--- /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 a345e7a5232..9b4554ebdae 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 d5e312c3326..00000000000
--- 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 fd848c0de0e..00000000000
--- 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 82a7e2a12b9..00000000000
--- 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 136a3a903cc..c19c543a863 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 20724c0898a..3cad81eddd6 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 a323588d6cf..4439b230770 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 932f0b84d27..c34d3fae07c 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..505c630741f
--- /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 00000000000..4fff945831d
--- /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 00000000000..e64aec6b656
--- /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 3de81abd12b..ed7da8cfaab 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 be9e4d96509..77dcdf3095e 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 ea86d58d0e8..4bfb3e7451c 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 4011d756f19..00000000000
--- 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 7e91bd1aa2e..00000000000
--- 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 49af9116301..00000000000
--- 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 d5f33297ec8..567306e2357 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 d5932c062d9..c02d36719e7 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 290548b0420..469ec1fdadb 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 de8a642b7d6..fce950536ab 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..ecc437d00c2
--- /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 00000000000..4befbc3fda7
--- /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 00000000000..eb7fafab879
--- /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 9760327b35f..6f48f87a3eb 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 be0f314031c..00000000000
--- 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 6fa444f09da..00000000000
--- 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 5764a5b908d..00000000000
--- 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 696f81b7e7d..e1f5432f63b 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 15ed53a8e88..f1eb2130465 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 d94dc2e41d7..1d9a8085d69 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 3633fffbd54..9175dc9426f 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..3e47b4c98d8
--- /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 00000000000..89e7e0d384c
--- /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 00000000000..760d9b8b64b
--- /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 d65bba2d95b..5d95b1cc4fb 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 c0e517a9ea9..5cbfc8f5a14 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 46be4fac540..9795c38eac3 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 7b841f3bb4f..00000000000
--- 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 b3db1f38595..648cff9f4d6 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 3ba502b4a87..cd6e50dc951 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 2658011b8f1..6a98c62c460 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 d202e26ad9e..04969dc3560 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
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 00000000000..55ffde1bf5b
--- /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 00000000000..4bc374a03df
--- /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 00000000000..eb9df36e26f
--- /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/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..83f7ea34366
--- /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 00000000000..d48d9472428
--- /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 00000000000..bceeeaf9367
--- /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 05b200da5e4..94d3491fc37 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 68d720b7f5a..74389b27b0c 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 e5dd33f9bb1..a0685daa13b 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 16efdc145a1..5751a471683 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 0dde2f3baea..0bf9fca6954 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 d4a2e6f960c..dad4d37374e 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 36e4fc757bd..b81cecd001d 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 5395c7d79ec..455a479756b 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
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 00000000000..eb2c8a57d1b
--- /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 00000000000..90149286a7a
--- /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 00000000000..cb82106d408
--- /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/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..06de8a69a0e
--- /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 00000000000..ff5f2b07583
--- /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 00000000000..7512d2570ba
--- /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 e3735375569..ec581bea137 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 0801ea95262..65fe142482c 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 ee8e8470e2b..6daff26581e 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 c2452c2c224..51112008174 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 8b8cb62fe47..0bba0157d34 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 384c341b929..c72bf6b2971 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 105dcd663f2..08eac348a64 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 781e0b07c9d..20bd219661e 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..cd937dda271
--- /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 00000000000..b99e3b8e22e
--- /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 00000000000..43d40b2c831
--- /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 a345e7a5232..9b4554ebdae 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 d5e312c3326..00000000000
--- 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 fd848c0de0e..00000000000
--- 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 82a7e2a12b9..00000000000
--- 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 136a3a903cc..c19c543a863 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 20724c0898a..3cad81eddd6 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 a323588d6cf..4439b230770 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 67468a99c33..ea1e4eba3e2 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..bdbc85a3dfd
--- /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 00000000000..db5326cb909
--- /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 00000000000..cd878b2fb17
--- /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 a216d8f97be..f2274160336 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 f535713360a..cb62eae0cba 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 ea86d58d0e8..4bfb3e7451c 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 4011d756f19..00000000000
--- 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 7e91bd1aa2e..00000000000
--- 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 49af9116301..00000000000
--- 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 d5f33297ec8..567306e2357 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 d5932c062d9..c02d36719e7 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 290548b0420..469ec1fdadb 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 e274bb59532..7c4c34e4310 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..2c257ce2c6c
--- /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 00000000000..e985e89310c
--- /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 00000000000..0ca26e1bf83
--- /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 9760327b35f..6f48f87a3eb 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 be0f314031c..00000000000
--- 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 6fa444f09da..00000000000
--- 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 5764a5b908d..00000000000
--- 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 696f81b7e7d..e1f5432f63b 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 15ed53a8e88..f1eb2130465 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 d94dc2e41d7..1d9a8085d69 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 5447d527dd5..a91ea08866a 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..a7f44c48f1c
--- /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 00000000000..0310fb92647
--- /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 00000000000..2e6c2fb6bca
--- /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 c2592b6f841..991dca9d7c0 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 b8b017e387f..8a1fc2eb2ac 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 46be4fac540..9795c38eac3 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 556d5880e84..00000000000
--- 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 b3db1f38595..648cff9f4d6 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 3ba502b4a87..cd6e50dc951 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 2658011b8f1..6a98c62c460 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/attr-referrer/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..241c2992c66
--- /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 00000000000..ae8ec23347a
--- /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 00000000000..fdcb496294f
--- /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 00000000000..d2967631328
--- /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 00000000000..03583e915f3
--- /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 00000000000..6acf86a6147
--- /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 00000000000..c6dec68c7d9
--- /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 00000000000..96d93615f47
--- /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 00000000000..e2e1e5910d7
--- /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 00000000000..264fc89599c
--- /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 00000000000..7ae61942e44
--- /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 00000000000..daaf6eb129f
--- /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 00000000000..78a039b6187
--- /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 00000000000..2e6c73eb0c6
--- /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 00000000000..850db27c613
--- /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 00000000000..550137b9edb
--- /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-csp/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-csp/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-csp/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 49e56d6bd46..2f28fce0ca4 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..a53d1123738
--- /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 00000000000..e631f74251f
--- /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 00000000000..3164988cabc
--- /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 5d498c283b6..c6f650306cc 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 bc578a5251c..00000000000
--- 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 7f2f93ab7d0..00000000000
--- 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 7f9c7bd3c04..00000000000
--- 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 4799c25896b..8b64318849c 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 dbee9e53471..e583be018ab 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 4f1e37349b0..34bf3b7081f 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 c55b042a827..6eefb7e9c64 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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/13503
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index e3bc9eaed70..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: https://github.com/servo/servo/issues/4767
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 00000000000..25c194a90c5
--- /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 00000000000..d312fb8b894
--- /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 00000000000..0b6dc221b30
--- /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 4bd973d40d3..f96afb67367 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 f370b4ff214..d9053efc9b0 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 15b544d06a8..4867ef3001b 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 0392f7d757b..00000000000
--- 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 c437578ff7c..00000000000
--- 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 f37601030b1..00000000000
--- 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 17e2f4eb75e..0c8b03be02b 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 26d0578ce86..e16b6bde645 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 0dc504cd848..627f6347a3c 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-csp/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-csp/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-csp/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 9481271e576..63e74c508a1 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..7f100b45481
--- /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 00000000000..cfcdfc72619
--- /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 00000000000..278c0c64e30
--- /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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..79e18d4337d
--- /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 00000000000..697c7999c49
--- /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 00000000000..953235934b5
--- /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-http/script-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/script-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 fadbd61af8a..68885afa757 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 74ed78b8237..00000000000
--- 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 86f9c315307..00000000000
--- 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 5f50db31498..00000000000
--- 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 74ec48c7cf1..fe8d7d031c9 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 33332fe9b61..da22a55fa45 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 9d9ac103fbe..a4ac6a12cf9 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 45d8913c723..af7f2e087ca 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..fbe06659a53
--- /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 00000000000..86bcec54d61
--- /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 00000000000..7429d6c0027
--- /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/iframe-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/img-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..d669a7c933e
--- /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 00000000000..5d82d1d692b
--- /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 00000000000..98e3f7a7336
--- /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/script-tag/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/script-tag/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 12010fa637e..d9c3038a8db 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 fa2b694c2c8..a3a4b98a10c 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 4149d01d5f9..70959ee90ce 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 95c35b05408..00000000000
--- 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 95845e3b7e0..00000000000
--- 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 dc44467e2b7..00000000000
--- 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 3d4a02c5048..a7fbc07c2c5 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 423733f8d8b..8bec8fec14f 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 c75654d3c05..cbb62e79567 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/__dir__.ini b/tests/wpt/metadata/referrer-policy/unset-referrer-policy/__dir__.ini
deleted file mode 100644
index 163ca23a12f..00000000000
--- a/tests/wpt/metadata/referrer-policy/unset-referrer-policy/__dir__.ini
+++ /dev/null
@@ -1 +0,0 @@
-disabled: for now
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 00000000000..87fbd96db78
--- /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 00000000000..2b974297198
--- /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 00000000000..0c4f84e8644
--- /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 00000000000..069b8be2307
--- /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 00000000000..82a572ef120
--- /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 00000000000..2259abf9a22
--- /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 00000000000..1792e253c54
--- /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 00000000000..bd331a127bf
--- /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 00000000000..f9da898e2fd
--- /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 00000000000..bc53e18c7e2
--- /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 00000000000..6c4ee499a2e
--- /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 00000000000..9103b128296
--- /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 00000000000..a011497f594
--- /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 00000000000..05ea6871cbc
--- /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 00000000000..2b97fa6f3a0
--- /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 00000000000..ccc6c7a6877
--- /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 00000000000..75fc6efa0e3
--- /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 00000000000..23fb2f0e215
--- /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 00000000000..a9d14d7c37d
--- /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 00000000000..75ddef372f8
--- /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 00000000000..1e2b1055704
--- /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 00000000000..c44a7952d0b
--- /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 00000000000..a94808c0bd2
--- /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 00000000000..745d0bb6471
--- /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 00000000000..caed3c280da
--- /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 00000000000..c9f2d9a2df5
--- /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 00000000000..33d12116ea0
--- /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 00000000000..f991d37bafa
--- /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 00000000000..86ff8379e60
--- /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 00000000000..c0e212de63a
--- /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 00000000000..1c91b43bde1
--- /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 00000000000..7f27d13053f
--- /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 00000000000..e453af3d9b6
--- /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 00000000000..31b29c11c9d
--- /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 00000000000..75301d8ba54
--- /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 00000000000..a85c83ce1e4
--- /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 00000000000..0b9e7717c63
--- /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 00000000000..0a89b6c7637
--- /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 00000000000..7d7b3c47f1a
--- /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 00000000000..1d2cbaa7817
--- /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 00000000000..3d77b5936f9
--- /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 00000000000..384e4612621
--- /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 00000000000..dc070973604
--- /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 00000000000..8ef614e6be3
--- /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 00000000000..1c9028cce27
--- /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 00000000000..17cc40feab4
--- /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 00000000000..1c713b886c6
--- /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 00000000000..7b70f7ed0ae
--- /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 00000000000..32ed8f7abd6
--- /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 00000000000..82354405ef0
--- /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 00000000000..877c9c15403
--- /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 00000000000..7c8c727c0ff
--- /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 00000000000..1a7723838ee
--- /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 00000000000..aff30655e2d
--- /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 00000000000..30d13a77473
--- /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 00000000000..be13ae638e3
--- /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 00000000000..9e02f98eb31
--- /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 00000000000..1e91e32bd6a
--- /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 00000000000..f93e4ef1448
--- /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 00000000000..36e30ba6992
--- /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 00000000000..7e00df7995a
--- /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 00000000000..30d05813516
--- /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 00000000000..3113d29a525
--- /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 00000000000..aa3151aa2bd
--- /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 00000000000..c9e90224a2e
--- /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 00000000000..0f203ba305b
--- /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 00000000000..dcdd6938e5b
--- /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 00000000000..3f2404df74a
--- /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 00000000000..dde0c362dcd
--- /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 00000000000..b1faab0d492
--- /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 00000000000..8445b82923b
--- /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 00000000000..4579d20a688
--- /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 00000000000..d1f76008abe
--- /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 00000000000..20f1e63be34
--- /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 00000000000..d7137fcb533
--- /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 00000000000..b25e2d2d880
--- /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 00000000000..a2a5cffd1d5
--- /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 00000000000..41fe83efb95
--- /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 00000000000..23da34b0cd5
--- /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 00000000000..08898f89895
--- /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 00000000000..8982fb1a9fa
--- /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 00000000000..624d5f54a2d
--- /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 00000000000..2651cd4490e
--- /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 00000000000..4339b27d57e
--- /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 a55dd4fa48d..ee0ea805ca0 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 8a363f316bd..00000000000
--- 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 bb968ef6d8d..29450885a68 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 52e7f0fcea5..e76c77300bc 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
 
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
index a2d3e8ced04..40f4234ad48 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
@@ -16,31 +16,29 @@
     <div class="styled"></div>
 
     <script>
-      let css_test = async_test("Child css from external stylesheet.");
-      let id = token();
-      let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
-      let css_url = url_prefix +
-        "/referrer-policy/generic/subresource/stylesheet.py?id=" + id +
-        "&import-rule" + "&referrer-policy=no-referrer";
-      let check_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py" +
-                      "?id=" + id + "&report-headers";
+      async_test(function(css_test) {
+        let id = token();
+        let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
+        let css_url = url_prefix +
+          "/referrer-policy/generic/subresource/stylesheet.py?id=" + id +
+          "&import-rule" + "&referrer-policy=no-referrer";
+        let check_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py" +
+                        "?id=" + id + "&report-headers";
 
-      let link = document.createElement("link");
-      link.href = css_url;
-      link.rel = "stylesheet";
-      link.onload = function() {
-        css_test.step_timeout(
-            queryXhr.bind(this, check_url,
-                          function(message) {
-                            css_test.step(function() {
-                              assert_own_property(message, "headers");
-                              assert_equals(message.referrer, undefined);
-                            });
-                            css_test.done();
-                          }),
-            1000);
-      };
-      document.head.appendChild(link);
+        let link = document.createElement("link");
+        link.href = css_url;
+        link.rel = "stylesheet";
+        link.onload = function() {
+          css_test.step_timeout(function() {
+              queryXhr(check_url, function(message) {
+                  assert_own_property(message, "headers");
+                  assert_equals(message.referrer, undefined);
+                  css_test.done();
+              }, null, null, css_test);
+          }, 1000);
+        };
+        document.head.appendChild(link);
+      }, "Child css from external stylesheet.");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
index aebf5031484..30c5ea29030 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
@@ -16,28 +16,26 @@
     <div class="styled"></div>
 
     <script>
-      let css_test = async_test("Child css from internal stylesheet.");
-      let id = token();
-      let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
-      let css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id + "&import-rule";
-      let check_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py" +
-                      "?id=" + id + "&report-headers";
+      async_test(function(css_test) {
+        let id = token();
+        let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
+        let css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id + "&import-rule";
+        let check_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py" +
+                        "?id=" + id + "&report-headers";
 
-      let style = document.createElement("style");
-      style.type = 'text/css';
-      style.appendChild(document.createTextNode("@import url('" + css_url + "');"));
-      document.head.appendChild(style);
-      css_test.step_timeout(
-        queryXhr.bind(this, check_url,
-                      function(message) {
-                        css_test.step(function() {
-                          assert_own_property(message, "headers");
-                          assert_own_property(message, "referrer");
-                          assert_equals(message.referrer, css_url);
-                        });
-                        css_test.done();
-                      }),
-        1000);
+        let style = document.createElement("style");
+        style.type = 'text/css';
+        style.appendChild(document.createTextNode("@import url('" + css_url + "');"));
+        document.head.appendChild(style);
+        css_test.step_timeout(function() {
+          queryXhr(check_url, function(message) {
+              assert_own_property(message, "headers");
+              assert_own_property(message, "referrer");
+              assert_equals(message.referrer, css_url);
+              css_test.done();
+          }, null, null, css_test);
+        }, 1000);
+      }, "Child css from internal stylesheet.");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
index b6333e2c7b2..52a0ded42a1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
@@ -15,31 +15,29 @@
     <div class="styled"></div>
 
     <script>
-      let css_test = async_test("Child css via a ProcessingInstruction.");
-      let id = token();
-      let url_prefix = location.protocol + "//www1." + location.hostname + ":" +
-                       location.port +
-                       "/referrer-policy/generic/subresource/stylesheet.py?id=" +
-                       id;
-      let css_url = url_prefix + "&amp;import-rule";
-      let expected = url_prefix + "&import-rule";
-      let check_url = url_prefix + "&report-headers";
+      async_test(function(css_test) {
+        let id = token();
+        let url_prefix = location.protocol + "//www1." + location.hostname + ":" +
+                         location.port +
+                         "/referrer-policy/generic/subresource/stylesheet.py?id=" +
+                         id;
+        let css_url = url_prefix + "&amp;import-rule";
+        let expected = url_prefix + "&import-rule";
+        let check_url = url_prefix + "&report-headers";
 
-      let processingInstruction =
-        document.createProcessingInstruction(
-          "xml-stylesheet", "href=\"" +css_url + "\" type=\"text/css\"");
-      css_test.step_timeout(
-          queryXhr.bind(this, check_url,
-                        function(message) {
-                          css_test.step(function() {
-                            assert_own_property(message, "headers");
-                            assert_own_property(message, "referrer");
-                            assert_equals(message.referrer, expected);
-                          });
-                          css_test.done();
-                        }),
-          1000);
-      document.insertBefore(processingInstruction, document.firstChild);
+        let processingInstruction =
+          document.createProcessingInstruction(
+            "xml-stylesheet", "href=\"" +css_url + "\" type=\"text/css\"");
+        css_test.step_timeout(function() {
+            queryXhr(check_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, expected);
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
+        document.insertBefore(processingInstruction, document.firstChild);
+      }, "Child css via a ProcessingInstruction.");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/css-test-helper.js b/tests/wpt/web-platform-tests/referrer-policy/css-integration/css-test-helper.js
index f5886dbbcbe..788df16a456 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/css-test-helper.js
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/css-test-helper.js
@@ -33,22 +33,18 @@ function runSvgTests(testProperties, testDescription, testFunction) {
       property: property,
     };
 
-    testFunction(current);
+    current.test.step(function() { testFunction(current) });
 
     let check_url = url_prefix + "svg.py" + "?id=" + current.id +
                     "&report-headers";
-    current.test.step_timeout(
-      queryXhr.bind(this, check_url,
-                    function(message) {
-                      current.test.step(function() {
-                        assert_own_property(message, "headers");
-                        assert_own_property(message, "referrer");
-                        assert_equals(message.referrer, current.expected);
-                      });
-                      current.test.done();
-                    }),
-      800);
-
+    current.test.step_timeout(function() {
+      queryXhr(check_url, function(message) {
+          assert_own_property(message, "headers");
+          assert_own_property(message, "referrer");
+          assert_equals(message.referrer, current.expected);
+          current.test.done();
+      }, null, null, current.test);
+    }, 800);
   };
 
   add_result_callback(runNextTest);
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
index c344c56c5bf..80e3587ad62 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
@@ -17,35 +17,33 @@
     <div class="styled"></div>
 
     <script>
-      let css_test = async_test("Font from imported stylesheet (external).");
-      let id = token();
-      let css_url = location.protocol + "//www1." + location.hostname + ":" +
-        location.port +
-        "/referrer-policy/generic/subresource/stylesheet.py?id=" + id +
-        "&import-rule" + "&type=font";
-      let url_prefix = location.protocol + "//" + location.hostname + ":" + location.port;
-      let css_referrer = url_prefix +
-        "/referrer-policy/generic/subresource/stylesheet.py?id=" + id + "&type=font";
-      let font_url = url_prefix + "/referrer-policy/generic/subresource/font.py" +
-                     "?id=" + id + "&report-headers" + "&type=font";
+      async_test(function(css_test) {
+        let id = token();
+        let css_url = location.protocol + "//www1." + location.hostname + ":" +
+          location.port +
+          "/referrer-policy/generic/subresource/stylesheet.py?id=" + id +
+          "&import-rule" + "&type=font";
+        let url_prefix = location.protocol + "//" + location.hostname + ":" + location.port;
+        let css_referrer = url_prefix +
+          "/referrer-policy/generic/subresource/stylesheet.py?id=" + id + "&type=font";
+        let font_url = url_prefix + "/referrer-policy/generic/subresource/font.py" +
+                       "?id=" + id + "&report-headers" + "&type=font";
 
-      let link = document.createElement("link");
-      link.href = css_url;
-      link.rel = "stylesheet";
-      link.onload = function() {
-        css_test.step_timeout(
-            queryXhr.bind(this, font_url,
-                          function(message) {
-                            css_test.step(function() {
-                              assert_own_property(message, "headers");
-                              assert_own_property(message, "referrer");
-                              assert_equals(message.referrer, css_referrer);
-                            });
-                            css_test.done();
-                          }),
-            1000);
-      };
-      document.head.appendChild(link);
+        let link = document.createElement("link");
+        link.href = css_url;
+        link.rel = "stylesheet";
+        link.onload = function() {
+          css_test.step_timeout(function() {
+              queryXhr(font_url, function(message) {
+                  assert_own_property(message, "headers");
+                  assert_own_property(message, "referrer");
+                  assert_equals(message.referrer, css_referrer);
+                  css_test.done();
+              }, null, null, css_test);
+          }, 1000);
+        };
+        document.head.appendChild(link);
+      }, "Font from imported stylesheet (external).");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
index 24e4bb99900..a91eb3fe758 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
@@ -16,30 +16,28 @@
     <div class="styled"></div>
 
     <script>
-      let css_test = async_test("Font from external stylesheet.");
-      let id = token();
-      let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
-      let css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id + "&type=font";
-      let font_url = url_prefix + "/referrer-policy/generic/subresource/font.py" +
-                    "?id=" + id + "&report-headers";
+      async_test(function(css_test) {
+        let id = token();
+        let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
+        let css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id + "&type=font";
+        let font_url = url_prefix + "/referrer-policy/generic/subresource/font.py" +
+                      "?id=" + id + "&report-headers";
 
-      let link = document.createElement("link");
-      link.href = css_url;
-      link.rel = "stylesheet";
-      link.onload = function() {
-        css_test.step_timeout(
-            queryXhr.bind(this, font_url,
-                          function(message) {
-                            css_test.step(function() {
-                              assert_own_property(message, "headers");
-                              assert_own_property(message, "referrer");
-                              assert_equals(message.referrer, css_url);
-                            });
-                            css_test.done();
-                          }),
-            1000);
-      };
-      document.head.appendChild(link);
+        let link = document.createElement("link");
+        link.href = css_url;
+        link.rel = "stylesheet";
+        link.onload = function() {
+          css_test.step_timeout(function() {
+              queryXhr(font_url, function(message) {
+                  assert_own_property(message, "headers");
+                  assert_own_property(message, "referrer");
+                  assert_equals(message.referrer, css_url);
+                  css_test.done();
+              }, null, null, css_test);
+          }, 1000);
+        };
+        document.head.appendChild(link);
+      }, "Font from external stylesheet.");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
index 54e2383423c..a637082a4ce 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
@@ -17,28 +17,26 @@
     <div class="styled"></div>
 
     <script>
-      let css_test = async_test("Font from imported stylesheet (internal).");
-      let id = token();
-      let url_prefix = location.protocol + "//www1." + location.hostname + ":" +
-                       location.port + "/referrer-policy/generic/subresource/";
-      let css_url = url_prefix + "stylesheet.py?id=" + id + "&type=font";
-      let font_url = url_prefix + "font.py?report-headers&id=" + id;
+      async_test(function(css_test) {
+        let id = token();
+        let url_prefix = location.protocol + "//www1." + location.hostname + ":" +
+                         location.port + "/referrer-policy/generic/subresource/";
+        let css_url = url_prefix + "stylesheet.py?id=" + id + "&type=font";
+        let font_url = url_prefix + "font.py?report-headers&id=" + id;
 
-      let style = document.createElement("style");
-      style.textContent = "@import url('" + css_url + "');";
-      document.head.appendChild(style);
-      css_test.step_timeout(
-          queryXhr.bind(this, font_url,
-                        function(message) {
-                          css_test.step(function() {
-                            assert_own_property(message, "headers");
-                            assert_own_property(message, "referrer");
-                            assert_equals(message.referrer, css_url);
-                          });
-                          css_test.done();
-                        }),
-          1000);
-      </script>
+        let style = document.createElement("style");
+        style.textContent = "@import url('" + css_url + "');";
+        document.head.appendChild(style);
+        css_test.step_timeout(function() {
+            queryXhr(font_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, css_url);
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
+      }, "Font from imported stylesheet (internal).");
+    </script>
 
     <div id="log"></div>
   </body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
index b3869bcebdc..eebd864bc56 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
@@ -16,29 +16,27 @@
     <div class="styled"></div>
 
     <script>
-      let css_test = async_test("Font from internal stylesheet.");
-      let id = token();
-      let css_url = location.protocol + "//www1." + location.hostname + ":" +
-                    location.port +
-                    "/referrer-policy/generic/subresource/font.py" + "?id=" +
-                    id + "&type=font";
-      let font_url = css_url + "&report-headers";
+      async_test(function(css_test) {
+        let id = token();
+        let css_url = location.protocol + "//www1." + location.hostname + ":" +
+                      location.port +
+                      "/referrer-policy/generic/subresource/font.py" + "?id=" +
+                      id + "&type=font";
+        let font_url = css_url + "&report-headers";
 
-      let style = document.createElement("style");
-      style.textContent = "@font-face { font-family: 'wpt'; font-style: normal; font-weight: normal; src: url(" + css_url + "); format('truetype'); } body { font-family: 'wpt';}";
-      document.head.appendChild(style);
-      css_test.step_timeout(
-          queryXhr.bind(this, font_url,
-                        function(message) {
-                          css_test.step(function() {
-                            assert_own_property(message, "headers");
-                            assert_own_property(message, "referrer");
-                            assert_equals(message.referrer, location.origin + "/");
-                          });
-                          css_test.done();
-                        }),
-          1000);
-      </script>
+        let style = document.createElement("style");
+        style.textContent = "@font-face { font-family: 'wpt'; font-style: normal; font-weight: normal; src: url(" + css_url + "); format('truetype'); } body { font-family: 'wpt';}";
+        document.head.appendChild(style);
+        css_test.step_timeout(function() {
+            queryXhr(font_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, location.origin + "/");
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
+      }, "Font from internal stylesheet.");
+    </script>
 
     <div id="log"></div>
   </body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
index 89ee918e24e..bfc42d9fcbe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
@@ -17,33 +17,31 @@
     <div class="styled"></div>
 
     <script>
-      let css_test = async_test("Font from external stylesheet (from ProcessingInstruction).");
-      let id = token();
-      let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
-      let css_url = url_prefix +
-                    "/referrer-policy/generic/subresource/stylesheet.py?id=" +
-                    id + "&amp;type=font";
-      let expected = url_prefix +
-                    "/referrer-policy/generic/subresource/stylesheet.py?id=" +
-                    id + "&type=font";
-      let font_url = url_prefix + "/referrer-policy/generic/subresource/font.py" +
-                     "?id=" + id + "&report-headers";
+      async_test(function(css_test) {
+        let id = token();
+        let url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
+        let css_url = url_prefix +
+                      "/referrer-policy/generic/subresource/stylesheet.py?id=" +
+                      id + "&amp;type=font";
+        let expected = url_prefix +
+                      "/referrer-policy/generic/subresource/stylesheet.py?id=" +
+                      id + "&type=font";
+        let font_url = url_prefix + "/referrer-policy/generic/subresource/font.py" +
+                       "?id=" + id + "&report-headers";
 
-      let processingInstruction =
-        document.createProcessingInstruction(
-          "xml-stylesheet", "href=\"" + css_url + "\" type=\"text/css\"");
-      css_test.step_timeout(
-          queryXhr.bind(this, font_url,
-                        function(message) {
-                          css_test.step(function() {
-                            assert_own_property(message, "headers");
-                            assert_own_property(message, "referrer");
-                            assert_equals(message.referrer, expected);
-                          });
-                          css_test.done();
-                        }),
-          1000);
-      document.insertBefore(processingInstruction, document.firstChild);
+        let processingInstruction =
+          document.createProcessingInstruction(
+            "xml-stylesheet", "href=\"" + css_url + "\" type=\"text/css\"");
+        css_test.step_timeout(function() {
+            queryXhr(font_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, expected);
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
+        document.insertBefore(processingInstruction, document.firstChild);
+      }, "Font from external stylesheet (from ProcessingInstruction).");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
index 0023af31b17..80c71b0e215 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
@@ -17,35 +17,33 @@
     <div class="styled"></div>
 
     <script>
-      var css_test = async_test("Image from imported stylesheet (external).");
-      var id = token();
-      var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-        "/referrer-policy/generic/subresource/stylesheet.py?id=" + id +
-        "&import-rule" + "&type=image";
-      var url_prefix = location.protocol + "//" + location.hostname + ":" + location.port;
-      var css_referrer = url_prefix +
-        "/referrer-policy/generic/subresource/stylesheet.py?id=" + id +
-        "&type=image";
-      var img_url = url_prefix + "/referrer-policy/generic/subresource/image.py" +
-                    "?id=" + id + "&report-headers";
+      async_test(function(css_test) {
+        var id = token();
+        var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+          "/referrer-policy/generic/subresource/stylesheet.py?id=" + id +
+          "&import-rule" + "&type=image";
+        var url_prefix = location.protocol + "//" + location.hostname + ":" + location.port;
+        var css_referrer = url_prefix +
+          "/referrer-policy/generic/subresource/stylesheet.py?id=" + id +
+          "&type=image";
+        var img_url = url_prefix + "/referrer-policy/generic/subresource/image.py" +
+                      "?id=" + id + "&report-headers";
 
-      var link = document.createElement("link");
-      link.href = css_url;
-      link.rel = "stylesheet";
-      link.onload = function() {
-        css_test.step_timeout(
-            queryXhr.bind(this, img_url,
-                          function(message) {
-                            css_test.step(function() {
-                              assert_own_property(message, "headers");
-                              assert_own_property(message, "referrer");
-                              assert_equals(message.referrer, css_referrer);
-                            });
-                            css_test.done();
-                          }),
-            1000);
-      };
-      document.head.appendChild(link);
+        var link = document.createElement("link");
+        link.href = css_url;
+        link.rel = "stylesheet";
+        link.onload = function() {
+          css_test.step_timeout(function() {
+              queryXhr(img_url, function(message) {
+                  assert_own_property(message, "headers");
+                  assert_own_property(message, "referrer");
+                  assert_equals(message.referrer, css_referrer);
+                  css_test.done();
+               }, null, null, css_test);
+          }, 1000);
+        };
+        document.head.appendChild(link);
+      }, "Image from imported stylesheet (external).");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
index d14769db4a1..ba7497b97de 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
@@ -16,30 +16,28 @@
     <div class="styled"></div>
 
     <script>
-      var css_test = async_test("Image from external stylesheet.");
-      var id = token();
-      var url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
-      var css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id;
-      var img_url = url_prefix + "/referrer-policy/generic/subresource/image.py" +
-                    "?id=" + id + "&report-headers";
+      async_test(function(css_test) {
+        var id = token();
+        var url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
+        var css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id;
+        var img_url = url_prefix + "/referrer-policy/generic/subresource/image.py" +
+                      "?id=" + id + "&report-headers";
 
-      var link = document.createElement("link");
-      link.href = css_url;
-      link.rel = "stylesheet";
-      link.onload = function() {
-        css_test.step_timeout(
-            queryXhr.bind(this, img_url,
-                          function(message) {
-                            css_test.step(function() {
-                              assert_own_property(message, "headers");
-                              assert_own_property(message, "referrer");
-                              assert_equals(message.referrer, css_url);
-                            });
-                            css_test.done();
-                          }),
-            1000);
-      };
-      document.head.appendChild(link);
+        var link = document.createElement("link");
+        link.href = css_url;
+        link.rel = "stylesheet";
+        link.onload = css_test.step_func(function() {
+          css_test.step_timeout(function() {
+              queryXhr(img_url, function(message) {
+                  assert_own_property(message, "headers");
+                  assert_own_property(message, "referrer");
+                  assert_equals(message.referrer, css_url);
+                  css_test.done();
+              }, null, null, css_test);
+          }, 1000);
+        });
+        document.head.appendChild(link);
+      }, "Image from external stylesheet.");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
index 42128ae0620..758b6d91852 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
@@ -16,25 +16,23 @@
     <div class="styled"></div>
 
     <script>
-      var css_test = async_test("Image from inline styles.");
-      var id = token();
-      var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/image.py" + "?id=" + id;
-      var img_url = css_url + "&report-headers";
+      async_test(function(css_test) {
+        var id = token();
+        var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/image.py" + "?id=" + id;
+        var img_url = css_url + "&report-headers";
 
-      var div = document.querySelector("div.styled");
-      div.style = "content:url(" + css_url + ")";
-      css_test.step_timeout(
-          queryXhr.bind(this, img_url,
-                        function(message) {
-                          css_test.step(function() {
-                            assert_own_property(message, "headers");
-                            assert_own_property(message, "referrer");
-                            assert_equals(message.referrer, location.origin + "/");
-                          });
-                          css_test.done();
-                        }),
-          1000);
-      </script>
+        var div = document.querySelector("div.styled");
+        div.style = "content:url(" + css_url + ")";
+        css_test.step_timeout(function() {
+            queryXhr(img_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, location.origin + "/");
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
+      }, "Image from inline styles.");
+    </script>
 
     <div id="log"></div>
   </body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
index 90003547f4d..24aa1858304 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
@@ -17,28 +17,26 @@
     <div class="styled"></div>
 
     <script>
-      var css_test = async_test("Image from imported stylesheet (internal).");
-      var id = token();
-      var url_prefix =  location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/";
-      var css_url = url_prefix + "stylesheet.py?id=" + id;
-      var img_url = url_prefix + "image.py?report-headers&id=" + id;
+      async_test(function(css_test) {
+        var id = token();
+        var url_prefix =  location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/";
+        var css_url = url_prefix + "stylesheet.py?id=" + id;
+        var img_url = url_prefix + "image.py?report-headers&id=" + id;
 
-      var style = document.createElement("style");
-      style.type = 'text/css';
-      style.appendChild(document.createTextNode("@import url('" + css_url + "');"));
-      document.head.appendChild(style);
-      css_test.step_timeout(
-          queryXhr.bind(this, img_url,
-                        function(message) {
-                          css_test.step(function() {
-                            assert_own_property(message, "headers");
-                            assert_own_property(message, "referrer");
-                            assert_equals(message.referrer, css_url);
-                          });
-                          css_test.done();
-                        }),
-          1000);
-      </script>
+        var style = document.createElement("style");
+        style.type = 'text/css';
+        style.appendChild(document.createTextNode("@import url('" + css_url + "');"));
+        document.head.appendChild(style);
+        css_test.step_timeout(function() {
+            queryXhr(img_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, css_url);
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
+      }, "Image from imported stylesheet (internal).");
+    </script>
 
     <div id="log"></div>
   </body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
index 943108d66e4..f4567885e1f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
@@ -16,27 +16,25 @@
     <div class="styled"></div>
 
     <script>
-      var css_test = async_test("Image from internal stylesheet.");
-      var id = token();
-      var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/image.py" + "?id=" + id;
-      var img_url = css_url + "&report-headers";
+      async_test(function(css_test) {
+        var id = token();
+        var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/image.py" + "?id=" + id;
+        var img_url = css_url + "&report-headers";
 
-      var style = document.createElement("style");
-      style.type = 'text/css';
-      style.appendChild(document.createTextNode("div.styled::before { content:url(" + css_url + ")}"));
-      document.head.appendChild(style);
-      css_test.step_timeout(
-          queryXhr.bind(this, img_url,
-                        function(message) {
-                          css_test.step(function() {
-                            assert_own_property(message, "headers");
-                            assert_own_property(message, "referrer");
-                            assert_equals(message.referrer, location.origin + "/");
-                          });
-                          css_test.done();
-                        }),
-          1000);
-      </script>
+        var style = document.createElement("style");
+        style.type = 'text/css';
+        style.appendChild(document.createTextNode("div.styled::before { content:url(" + css_url + ")}"));
+        document.head.appendChild(style);
+        css_test.step_timeout(function() {
+          queryXhr(img_url, function(message) {
+            assert_own_property(message, "headers");
+            assert_own_property(message, "referrer");
+            assert_equals(message.referrer, location.origin + "/");
+            css_test.done();
+          }, null, null, css_test);
+        }, 1000);
+      }, "Image from internal stylesheet.");
+    </script>
 
     <div id="log"></div>
   </body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
index 78401d3ec16..d0a4d96f84c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
@@ -14,24 +14,22 @@
     the referrer and referrer policy from the document.</p>
 
     <script>
-      var css_test = async_test("Image from presentation attributes.");
-      var id = token();
-      var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/image.py" + "?id=" + id;
-      var img_url = css_url + "&report-headers";
+      async_test(function(css_test) {
+        var id = token();
+        var css_url = location.protocol + "//www1." + location.hostname + ":" + location.port + "/referrer-policy/generic/subresource/image.py" + "?id=" + id;
+        var img_url = css_url + "&report-headers";
 
-      document.body.background = css_url;
-      css_test.step_timeout(
-          queryXhr.bind(this, img_url,
-                        function(message) {
-                          css_test.step(function() {
-                            assert_own_property(message, "headers");
-                            assert_own_property(message, "referrer");
-                            assert_equals(message.referrer, location.origin + "/");
-                          });
-                          css_test.done();
-                        }),
-          1000);
-      </script>
+        document.body.background = css_url;
+        css_test.step_timeout(function() {
+            queryXhr(img_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, location.origin + "/");
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
+      }, "Image from presentation attributes.");
+    </script>
 
     <div id="log"></div>
   </body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
index 1ca18547dd5..926147be489 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
@@ -17,26 +17,24 @@
     <div class="styled"></div>
 
     <script>
-      var css_test = async_test("Image from external stylesheet (from ProcessingInstruction).");
-      var id = token();
-      var url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
-      var css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id;
-      var img_url = url_prefix + "/referrer-policy/generic/subresource/image.py" +
-                    "?id=" + id + "&report-headers";
+      async_test(function(css_test) {
+        var id = token();
+        var url_prefix = location.protocol + "//www1." + location.hostname + ":" + location.port;
+        var css_url = url_prefix + "/referrer-policy/generic/subresource/stylesheet.py?id=" + id;
+        var img_url = url_prefix + "/referrer-policy/generic/subresource/image.py" +
+                      "?id=" + id + "&report-headers";
 
-      var processingInstruction = document.createProcessingInstruction("xml-stylesheet", "href=\"" + css_url + "\" type=\"text/css\"");
-      css_test.step_timeout(
-          queryXhr.bind(this, img_url,
-                        function(message) {
-                          css_test.step(function() {
-                            assert_own_property(message, "headers");
-                            assert_own_property(message, "referrer");
-                            assert_equals(message.referrer, css_url);
-                          });
-                          css_test.done();
-                        }),
-          1000);
-      document.insertBefore(processingInstruction, document.firstChild);
+        var processingInstruction = document.createProcessingInstruction("xml-stylesheet", "href=\"" + css_url + "\" type=\"text/css\"");
+        css_test.step_timeout(function() {
+            queryXhr(img_url, function(message) {
+                assert_own_property(message, "headers");
+                assert_own_property(message, "referrer");
+                assert_equals(message.referrer, css_url);
+                css_test.done();
+            }, null, null, css_test);
+        }, 1000);
+        document.insertBefore(processingInstruction, document.firstChild);
+      }, "Image from external stylesheet (from ProcessingInstruction).");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/common.js b/tests/wpt/web-platform-tests/referrer-policy/generic/common.js
index f9bbe42b914..a16691bccb2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/common.js
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/common.js
@@ -99,15 +99,15 @@ function wrapResult(url, server_data) {
   }
 }
 
-function queryIframe(url, callback, referrer_policy) {
-  var iframe = appendIframeToBody(url, referrer_policy);
-  var listener = function(event) {
+function queryIframe(url, callback, attributes, referrer_policy, test) {
+  var iframe = appendIframeToBody(url, attributes);
+  var listener = test.step_func(function(event) {
     if (event.source != iframe.contentWindow)
       return;
 
     callback(event.data, url);
     window.removeEventListener("message", listener);
-  }
+  });
   window.addEventListener("message", listener);
 }
 
@@ -122,12 +122,12 @@ function queryImage(url, callback, attributes, referrerPolicy, test) {
   var noSrcDocPolicy = new Promise((resolve, reject) => {
     var iframeWithoutOwnPolicy = document.createElement('iframe');
     iframeWithoutOwnPolicy.srcdoc = "Hello, world.";
-    iframeWithoutOwnPolicy.onload = function () {
+    iframeWithoutOwnPolicy.onload = test.step_func(function () {
       var nextUrl = url + "&cache_destroyer2=" + (new Date()).getTime();
-      loadImageInWindow(nextUrl, function (img) {
+      loadImageInWindow(nextUrl, test.step_func(function (img) {
         resolve(decodeImageData(extractImageData(img)));
-      }, attributes, iframeWithoutOwnPolicy.contentWindow);
-    };
+      }), attributes, iframeWithoutOwnPolicy.contentWindow);
+    });
     document.body.appendChild(iframeWithoutOwnPolicy);
   });
 
@@ -137,19 +137,19 @@ function queryImage(url, callback, attributes, referrerPolicy, test) {
     var iframeWithOwnPolicy = document.createElement('iframe');
     iframeWithOwnPolicy.srcdoc = "<meta name='referrer' content='" + iframePolicy + "'>Hello world.";
 
-    iframeWithOwnPolicy.onload = function () {
+    iframeWithOwnPolicy.onload = test.step_func(function () {
       var nextUrl = url + "&cache_destroyer3=" + (new Date()).getTime();
-      loadImageInWindow(nextUrl, function (img) {
+      loadImageInWindow(nextUrl, test.step_func(function (img) {
         resolve(decodeImageData(extractImageData(img)));
-      }, null, iframeWithOwnPolicy.contentWindow);
-    };
+      }), null, iframeWithOwnPolicy.contentWindow);
+    });
     document.body.appendChild(iframeWithOwnPolicy);
   });
 
   var pagePolicy = new Promise((resolve, reject) => {
-    loadImageInWindow(url, function (img) {
+    loadImageInWindow(url, test.step_func(function (img) {
       resolve(decodeImageData(extractImageData(img)));
-    }, attributes, window);
+    }), attributes, window);
   });
 
   Promise.all([noSrcDocPolicy, srcDocPolicy, pagePolicy]).then(test.step_func(values => {
@@ -159,52 +159,52 @@ function queryImage(url, callback, attributes, referrerPolicy, test) {
   }));
 }
 
-function queryXhr(url, callback) {
+function queryXhr(url, callback, attributes, referrer_policy, test) {
   var xhr = new XMLHttpRequest();
   xhr.open('GET', url, true);
-  xhr.onreadystatechange = function(e) {
-    if (this.readyState == 4 && this.status == 200) {
-      var server_data = JSON.parse(this.responseText);
+  xhr.onreadystatechange = test.step_func(function(e) {
+    if (xhr.readyState == 4 && xhr.status == 200) {
+      var server_data = JSON.parse(xhr.responseText);
       callback(wrapResult(url, server_data), url);
     }
-  };
+  });
   xhr.send();
 }
 
-function queryWorker(url, callback) {
+function queryWorker(url, callback, attributes, referrer_policy, test) {
   var worker = new Worker(url);
-  worker.onmessage = function(event) {
+  worker.onmessage = test.step_func(function(event) {
     var server_data = event.data;
     callback(wrapResult(url, server_data), url);
-  };
+  });
 }
 
-function queryModuleWorkerTopLevel(url, callback) {
+function queryModuleWorkerTopLevel(url, callback, attributes, referrer_policy, test) {
   var worker = new Worker(url, {type: "module"});
-  worker.onmessage = function(event) {
+  worker.onmessage = test.step_func(function(event) {
     var server_data = event.data;
     callback(wrapResult(url, server_data), url);
-  };
+  });
 }
 
-function querySharedWorker(url, callback) {
+function querySharedWorker(url, callback, attributes, referrer_policy, test) {
   var worker = new SharedWorker(url);
-  worker.port.onmessage = function(event) {
+  worker.port.onmessage = test.step_func(function(event) {
     var server_data = event.data;
     callback(wrapResult(url, server_data), url);
-  };
+  });
 }
 
-function queryFetch(url, callback) {
-  fetch(url).then(function(response) {
-      response.json().then(function(server_data) {
+function queryFetch(url, callback, attributes, referrer_policy, test) {
+  fetch(url).then(test.step_func(function(response) {
+      response.json().then(test.step_func(function(server_data) {
         callback(wrapResult(url, server_data), url);
-      });
-    }
+      }));
+    })
   );
 }
 
-function queryNavigable(element, url, callback, attributes) {
+function queryNavigable(element, url, callback, attributes, test) {
   var navigable = element
   navigable.href = url;
   navigable.target = "helper-iframe";
@@ -220,42 +220,41 @@ function queryNavigable(element, url, callback, attributes) {
     }
   }
 
-  var listener = function(event) {
+  var listener = test.step_func(function(event) {
     if (event.source != helperIframe.contentWindow)
       return;
-
     callback(event.data, url);
     window.removeEventListener("message", listener);
-  }
+  });
   window.addEventListener("message", listener);
 
   navigable.click();
 }
 
-function queryLink(url, callback, referrer_policy) {
+function queryLink(url, callback, attributes, referrer_policy, test) {
   var a = document.createElement("a");
   a.innerHTML = "Link to subresource";
   document.body.appendChild(a);
-  queryNavigable(a, url, callback, referrer_policy)
+  queryNavigable(a, url, callback, attributes, test)
 }
 
-function queryAreaLink(url, callback, referrer_policy) {
+function queryAreaLink(url, callback, attributes, referrer_policy, test) {
   var area = document.createElement("area");
   // TODO(kristijanburnik): Append to map and add image.
   document.body.appendChild(area);
-  queryNavigable(area, url, callback, referrer_policy)
+  queryNavigable(area, url, callback, attributes, test)
 }
 
-function queryScript(url, callback, attributes, referrer_policy) {
+function queryScript(url, callback, attributes, referrer_policy, test) {
   var script = document.createElement("script");
   script.src = url;
   script.referrerPolicy = referrer_policy;
 
-  var listener = function(event) {
+  var listener = test.step_func(function(event) {
     var server_data = event.data;
     callback(wrapResult(url, server_data), url);
     window.removeEventListener("message", listener);
-  }
+  });
   window.addEventListener("message", listener);
 
   document.body.appendChild(script);
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.js b/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.js
index 4641683cd85..2385cc2a1c4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.js
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.js
@@ -96,31 +96,31 @@ function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
     },
 
     start: function() {
-      t._constructSubresourceUrl();
-      t._constructExpectedReferrerUrl();
-
-      var test = async_test(t._testDescription);
-
-      t._invokeSubresource(function(result) {
-        // Check if the result is in valid format. NOOP in release.
-        sanityChecker.checkSubresourceResult(
-            test, t._scenario, t._subresourceUrl, result);
-
-        // Check the reported URL.
-        test.step(function() {
-          assert_equals(result.referrer,
-                        t._expectedReferrerUrl,
-                        "Reported Referrer URL is '" +
-                        t._scenario.referrer_url + "'.");
-          assert_equals(result.headers.referer,
-                        t._expectedReferrerUrl,
-                        "Reported Referrer URL from HTTP header is '" +
-                        t._expectedReferrerUrl + "'");
-        }, "Reported Referrer URL is as expected: " + t._scenario.referrer_url);
-
-        test.done();
-      }, test);
-
+      async_test(function(test) {
+
+        t._constructSubresourceUrl();
+        t._constructExpectedReferrerUrl();
+
+        t._invokeSubresource(test.step_func(function(result) {
+          // Check if the result is in valid format. NOOP in release.
+          sanityChecker.checkSubresourceResult(
+              test, t._scenario, t._subresourceUrl, result);
+
+          // Check the reported URL.
+          test.step(function() {
+            assert_equals(result.referrer,
+                          t._expectedReferrerUrl,
+                          "Reported Referrer URL is '" +
+                          t._scenario.referrer_url + "'.");
+            assert_equals(result.headers.referer,
+                          t._expectedReferrerUrl,
+                          "Reported Referrer URL from HTTP header is '" +
+                          t._expectedReferrerUrl + "'");
+          }, "Reported Referrer URL is as expected: " + t._scenario.referrer_url);
+
+          test.done();
+        }), test);
+      }, t._testDescription);
     }
   }
 
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html b/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
index 8fee77f8363..1b2b12bf691 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
@@ -13,26 +13,28 @@
     <h1>Referrer Policy: A document with an opaque origin doesn't send referrers</h1>
     <script>
       function testSandboxedIframe(description, sandboxAttributes, expectedReferrer) {
-        var test = async_test(description);
-        window.addEventListener("message", test.step_func((msg) => {
-          if (msg.data.description === description) {
-            assert_equals(msg.data.referrer, expectedReferrer);
-            test.done();
-          }
-        }));
+        async_test(function(test) {
+          window.addEventListener("message", test.step_func((msg) => {
+            if (msg.data.description === description) {
+              assert_equals(msg.data.referrer, expectedReferrer);
+              test.done();
+            }
+          }));
 
-        var iframe = document.createElement("iframe");
-        iframe.sandbox = sandboxAttributes;
-        iframe.srcdoc = `
-            <meta name = "referrer" content = "always">
-            <script src = "/referrer-policy/generic/common.js"></` + `script>
-            <script>
-              var urlPath = "/referrer-policy/generic/subresource/xhr.py";
-              var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
-              queryXhr(url, (msg) => {
-                  parent.postMessage({referrer: msg.referrer, description: "${description}"}, "*")});
-            </` + "script>";
-        document.body.appendChild(iframe);
+          var iframe = document.createElement("iframe");
+          iframe.sandbox = sandboxAttributes;
+          iframe.srcdoc = `
+              <meta name = "referrer" content = "always">
+              <script src = "/referrer-policy/generic/common.js"></` + `script>
+              <script>
+                var urlPath = "/referrer-policy/generic/subresource/xhr.py";
+                var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
+                queryXhr(url, (msg) => {
+                    parent.postMessage({referrer: msg.referrer, description: "${description}"}, "*")
+                }, null, null, test);
+              </` + "script>";
+          document.body.appendChild(iframe);
+        }, description);
       }
 
       testSandboxedIframe("Sandboxed iframe with opaque origin doesn't send referrers.", "allow-scripts", undefined);
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
index bca7e479fa2..3eb824521b7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
@@ -16,22 +16,21 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      var messaging_test = async_test("Area is responding with HTTP headers");
-      var urlPath = '/referrer-policy/generic/subresource/document.py';
-      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                urlPath;
-      queryAreaLink(url, function(message) {
-        var pre = document.getElementById('received_message')
-        var headers = message.headers;
-        pre.innerHTML = "";
-        pre.innerHTML += url + ":\n\n";
-        pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-        messaging_test.step(function() {
+      async_test(function(messaging_test) {
+        var urlPath = '/referrer-policy/generic/subresource/document.py';
+        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                  urlPath;
+        queryAreaLink(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
           assert_own_property(headers, "host")
           assert_own_property(headers, "connection")
-        });
-        messaging_test.done();
-      });
+          messaging_test.done();
+        }, null, null, messaging_test);
+      }, "Area is responding with HTTP headers");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
index 046b29e9a3e..edb159d9eb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
@@ -24,22 +24,21 @@
         if (!window.fetch)
           return;
 
-        var fetch_test = async_test("Fetch is responding with HTTP headers");
-        var urlPath = '/referrer-policy/generic/subresource/xhr.py';
-        var url = location.protocol + "//" + location.hostname + ":" +
-                  location.port + urlPath;
-        queryFetch(url, function(message) {
-          var pre = document.getElementById('received_message')
-          var headers = message.headers;
-          pre.innerHTML = "";
-          pre.innerHTML += url + ":\n\n";
-          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n";
-          fetch_test.step(function() {
+        async_test(function(fetch_test) {
+          var urlPath = '/referrer-policy/generic/subresource/xhr.py';
+          var url = location.protocol + "//" + location.hostname + ":" +
+                    location.port + urlPath;
+          queryFetch(url, function(message) {
+            var pre = document.getElementById('received_message')
+            var headers = message.headers;
+            pre.innerHTML = "";
+            pre.innerHTML += url + ":\n\n";
+            pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n";
             assert_own_property(headers, "host")
             assert_own_property(headers, "connection")
-          });
-          fetch_test.done();
-        });
+            fetch_test.done();
+          }, null, null, fetch_test);
+        }, "Fetch is responding with HTTP headers");
       })();
     </script>
 
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
index a3e55707c26..606e18b281f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
@@ -16,22 +16,21 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      var messaging_test = async_test("Iframe is responding with HTTP headers");
-      var urlPath = '/referrer-policy/generic/subresource/document.py';
-      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                urlPath;
-      queryIframe(url, function(message) {
-        var pre = document.getElementById('received_message')
-        var headers = message.headers;
-        pre.innerHTML = "";
-        pre.innerHTML += url + ":\n\n";
-        pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-        messaging_test.step(function() {
+      async_test(function(messaging_test) {
+        var urlPath = '/referrer-policy/generic/subresource/document.py';
+        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                  urlPath;
+        queryIframe(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
           assert_own_property(headers, "host")
           assert_own_property(headers, "connection")
-        });
-        messaging_test.done();
-      });
+          messaging_test.done();
+        }, null, null, messaging_test);
+      }, "Iframe is responding with HTTP headers");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
index 448f12b1348..9c50ea66193 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
@@ -16,22 +16,21 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      var messaging_test = async_test("Image is encoding headers as JSON.");
-      var urlPath = '/referrer-policy/generic/subresource/image.py';
-      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                urlPath + "?cache_destroyer=" + (new Date()).getTime();
-      queryImage(url, function(message) {
-        var pre = document.getElementById('received_message')
-        var headers = message.headers;
-        pre.innerHTML = "";
-        pre.innerHTML += url + ":\n\n";
-        pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-        messaging_test.step(function() {
+      async_test(function(messaging_test) {
+        var urlPath = '/referrer-policy/generic/subresource/image.py';
+        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                  urlPath + "?cache_destroyer=" + (new Date()).getTime();
+        queryImage(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
           assert_own_property(headers, "host")
           assert_own_property(headers, "connection")
-        });
-        messaging_test.done();
-      }, null, "always", messaging_test);
+          messaging_test.done();
+        }, null, "always", messaging_test);
+      }, "Image is encoding headers as JSON.");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
index 45e502004d4..95582f65bac 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
@@ -16,22 +16,21 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      var messaging_test = async_test("Link is responding with HTTP headers");
-      var urlPath = '/referrer-policy/generic/subresource/document.py';
-      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                urlPath;
-      queryLink(url, function(message) {
-        var pre = document.getElementById('received_message')
-        var headers = message.headers;
-        pre.innerHTML = "";
-        pre.innerHTML += url + ":\n\n";
-        pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-        messaging_test.step(function() {
+      async_test(function(messaging_test) {
+        var urlPath = '/referrer-policy/generic/subresource/document.py';
+        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                  urlPath;
+        queryLink(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
           assert_own_property(headers, "host")
           assert_own_property(headers, "connection")
-        });
-        messaging_test.done();
-      });
+          messaging_test.done();
+        }, null, null, messaging_test);
+      }, "Link is responding with HTTP headers");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
index 09c5db6193f..f73f4406df2 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
@@ -16,22 +16,21 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      var messaging_test = async_test("Script is responding with HTTP headers");
-      var urlPath = '/referrer-policy/generic/subresource/script.py';
-      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                urlPath;
-      queryScript(url, function(message) {
-        var pre = document.getElementById('received_message')
-        var headers = message.headers;
-        pre.innerHTML = "";
-        pre.innerHTML += url + ":\n\n";
-        pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-        messaging_test.step(function() {
+      async_test(function(messaging_test) {
+        var urlPath = '/referrer-policy/generic/subresource/script.py';
+        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                  urlPath;
+        queryScript(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
           assert_own_property(headers, "host")
           assert_own_property(headers, "connection")
-        });
-        messaging_test.done();
-      });
+          messaging_test.done();
+        }, null, null, messaging_test);
+      }, "Script is responding with HTTP headers");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
index 6d34366b943..fd7591882e9 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
@@ -16,22 +16,21 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      var messaging_test = async_test("Worker is responding with HTTP headers");
-      var urlPath = '/referrer-policy/generic/subresource/worker.py';
-      var url = location.protocol + "//" + location.hostname + ":" +
-                location.port + urlPath;
-      queryWorker(url, function(message) {
-        var pre = document.getElementById('received_message')
-        var headers = message.headers;
-        pre.innerHTML = "";
-        pre.innerHTML += url + ":\n\n";
-        pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-        messaging_test.step(function() {
+      async_test(function(messaging_test) {
+        var urlPath = '/referrer-policy/generic/subresource/worker.py';
+        var url = location.protocol + "//" + location.hostname + ":" +
+                  location.port + urlPath;
+        queryWorker(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
           assert_own_property(headers, "host")
           assert_own_property(headers, "connection")
-        });
-        messaging_test.done();
-      });
+          messaging_test.done();
+        }, null, null, messaging_test);
+      }, "Worker is responding with HTTP headers");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
index 09f69140098..6ef4a9cfd4b 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
@@ -16,22 +16,21 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      var messaging_test = async_test("XHR is responding with HTTP headers");
-      var urlPath = '/referrer-policy/generic/subresource/xhr.py';
-      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                urlPath;
-      queryXhr(url, function(message) {
-        var pre = document.getElementById('received_message')
-        var headers = message.headers;
-        pre.innerHTML = "";
-        pre.innerHTML += url + ":\n\n";
-        pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
-        messaging_test.step(function() {
+      async_test(function(messaging_test) {
+        var urlPath = '/referrer-policy/generic/subresource/xhr.py';
+        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                  urlPath;
+        queryXhr(url, function(message) {
+          var pre = document.getElementById('received_message')
+          var headers = message.headers;
+          pre.innerHTML = "";
+          pre.innerHTML += url + ":\n\n";
+          pre.innerHTML += JSON.stringify(headers, null, 2) + "\n\n"
           assert_own_property(headers, "host")
           assert_own_property(headers, "connection")
-        });
-        messaging_test.done();
-      });
+          messaging_test.done();
+        }, null, null, messaging_test);
+      }, "XHR is responding with HTTP headers");
     </script>
 
     <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html b/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
index 9627d165599..475efa55091 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
@@ -15,14 +15,15 @@
     <pre id="received_message">Running...</pre>
 
     <script>
-      var test = async_test("Image has a referrer despite CSP 'referrer' directive");
-      var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
-      var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
-                urlPath;
-      queryImage(url, test.step_func(function(message) {
-        assert_equals(message.referrer, document.location.href);
-        test.done();
-      }), null, 'always', test);
+      async_test(function(test) {
+        var urlPath = '/referrer-policy/generic/subresource/image.py?cache_destroyer=' + (new Date()).getTime();
+        var url = location.protocol + "//www1." + location.hostname + ":" + location.port +
+                  urlPath;
+        queryImage(url, function(message) {
+          assert_equals(message.referrer, document.location.href);
+          test.done();
+        }, null, 'always', test);
+      }, "Image has a referrer despite CSP 'referrer' directive");
     </script>
 
     <div id="log"></div>