From cb7e6715fb2168467b917a89ad1e62ebfc3966d9 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Wed, 5 Oct 2016 15:25:21 +0200
Subject: [PATCH 1/2] Provide the fetched data to fetch() consumers.

---
 components/script/body.rs                     | 31 ++++++++++++++-----
 components/script/dom/request.rs              | 22 +++++++------
 components/script/dom/response.rs             | 29 ++++++++++++++---
 components/script/fetch.rs                    | 13 ++++++--
 .../fetch/api/basic/text-utf8.html.ini        | 24 --------------
 .../request/request-consume-empty.html.ini    |  9 ++++++
 .../api/request/request-disturbed.html.ini    |  3 ++
 .../response/response-consume-empty.html.ini  | 24 +++++++++++---
 .../api/response/response-consume.html.ini    |  6 ----
 9 files changed, 102 insertions(+), 59 deletions(-)

diff --git a/components/script/body.rs b/components/script/body.rs
index 36a18134c98..276d6425d2f 100644
--- a/components/script/body.rs
+++ b/components/script/body.rs
@@ -24,6 +24,7 @@ use std::rc::Rc;
 use std::str;
 use url::form_urlencoded;
 
+#[derive(Copy, Clone, JSTraceable, HeapSizeOf)]
 pub enum BodyType {
     Blob,
     FormData,
@@ -47,14 +48,32 @@ pub fn consume_body<T: BodyOperations + Reflectable>(object: &T, body_type: Body
     if object.get_body_used() || object.is_locked() {
         promise.reject_error(promise.global().r().get_cx(), Error::Type(
             "The response's stream is disturbed or locked".to_string()));
+        return promise;
     }
 
+    object.set_body_promise(&promise, body_type);
+
     // Steps 2-4
     // TODO: Body does not yet have a stream.
 
+    consume_body_with_promise(object, body_type, &promise);
+
+    promise
+}
+
+// https://fetch.spec.whatwg.org/#concept-body-consume-body
+#[allow(unrooted_must_root)]
+pub fn consume_body_with_promise<T: BodyOperations + Reflectable>(object: &T,
+                                                                  body_type: BodyType,
+                                                                  promise: &Promise) {
     // Step 5
+    let body = match object.take_body() {
+        Some(body) => body,
+        None => return,
+    };
+
     let pkg_data_results = run_package_data_algorithm(object,
-                                                      object.take_body(),
+                                                      body,
                                                       body_type,
                                                       object.get_mime_type());
 
@@ -70,20 +89,15 @@ pub fn consume_body<T: BodyOperations + Reflectable>(object: &T, body_type: Body
         },
         Err(err) => promise.reject_error(cx, err),
     }
-    promise
 }
 
 // https://fetch.spec.whatwg.org/#concept-body-package-data
 #[allow(unsafe_code)]
 fn run_package_data_algorithm<T: BodyOperations + Reflectable>(object: &T,
-                                                               bytes: Option<Vec<u8>>,
+                                                               bytes: Vec<u8>,
                                                                body_type: BodyType,
                                                                mime_type: Ref<Vec<u8>>)
                                                                -> Fallible<FetchedData> {
-    let bytes = match bytes {
-        Some(b) => b,
-        _ => vec![],
-    };
     let cx = object.global().r().get_cx();
     let mime = &*mime_type;
     match body_type {
@@ -156,6 +170,9 @@ fn run_form_data_algorithm(root: GlobalRef, bytes: Vec<u8>, mime: &[u8]) -> Fall
 
 pub trait BodyOperations {
     fn get_body_used(&self) -> bool;
+    fn set_body_promise(&self, p: &Rc<Promise>, body_type: BodyType);
+    /// Returns `Some(_)` if the body is complete, `None` if there is more to
+    /// come.
     fn take_body(&self) -> Option<Vec<u8>>;
     fn is_locked(&self) -> bool;
     fn get_mime_type(&self) -> Ref<Vec<u8>>;
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs
index ebfe0abf49e..fa665679c0d 100644
--- a/components/script/dom/request.rs
+++ b/components/script/dom/request.rs
@@ -36,7 +36,6 @@ use net_traits::request::Request as NetTraitsRequest;
 use net_traits::request::RequestMode as NetTraitsRequestMode;
 use net_traits::request::Type as NetTraitsRequestType;
 use std::cell::{Cell, Ref};
-use std::mem;
 use std::rc::Rc;
 use url::Url;
 
@@ -47,6 +46,8 @@ pub struct Request {
     body_used: Cell<bool>,
     headers: MutNullableHeap<JS<Headers>>,
     mime_type: DOMRefCell<Vec<u8>>,
+    #[ignore_heap_size_of = "Rc"]
+    body_promise: DOMRefCell<Option<(Rc<Promise>, BodyType)>>,
 }
 
 impl Request {
@@ -62,6 +63,7 @@ impl Request {
             body_used: Cell::new(false),
             headers: Default::default(),
             mime_type: DOMRefCell::new("".to_string().into_bytes()),
+            body_promise: DOMRefCell::new(None),
         }
     }
 
@@ -662,20 +664,20 @@ impl BodyOperations for Request {
         self.BodyUsed()
     }
 
+    fn set_body_promise(&self, p: &Rc<Promise>, body_type: BodyType) {
+        assert!(self.body_promise.borrow().is_none());
+        self.body_used.set(true);
+        *self.body_promise.borrow_mut() = Some((p.clone(), body_type));
+    }
+
     fn is_locked(&self) -> bool {
         self.locked()
     }
 
     fn take_body(&self) -> Option<Vec<u8>> {
-        let ref mut net_traits_req = *self.request.borrow_mut();
-        let body: Option<Vec<u8>> = mem::replace(&mut *net_traits_req.body.borrow_mut(), None);
-        match body {
-            Some(_) => {
-                self.body_used.set(true);
-                body
-            },
-            _ => None,
-        }
+        let request = self.request.borrow_mut();
+        let body = request.body.borrow_mut().take();
+        Some(body.unwrap_or(vec![]))
     }
 
     fn get_mime_type(&self) -> Ref<Vec<u8>> {
diff --git a/components/script/dom/response.rs b/components/script/dom/response.rs
index 66a7e84f112..2287bb181b4 100644
--- a/components/script/dom/response.rs
+++ b/components/script/dom/response.rs
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use body::{BodyOperations, BodyType, consume_body};
+use body::{BodyOperations, BodyType, consume_body, consume_body_with_promise};
 use core::cell::Cell;
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::HeadersBinding::HeadersMethods;
@@ -44,6 +44,8 @@ pub struct Response {
     url_list: DOMRefCell<Vec<Url>>,
     // For now use the existing NetTraitsResponseBody enum
     body: DOMRefCell<NetTraitsResponseBody>,
+    #[ignore_heap_size_of = "Rc"]
+    body_promise: DOMRefCell<Option<(Rc<Promise>, BodyType)>>,
 }
 
 impl Response {
@@ -59,6 +61,7 @@ impl Response {
             url: DOMRefCell::new(None),
             url_list: DOMRefCell::new(vec![]),
             body: DOMRefCell::new(NetTraitsResponseBody::Empty),
+            body_promise: DOMRefCell::new(None),
         }
     }
 
@@ -194,18 +197,26 @@ impl BodyOperations for Response {
         self.BodyUsed()
     }
 
+    fn set_body_promise(&self, p: &Rc<Promise>, body_type: BodyType) {
+        assert!(self.body_promise.borrow().is_none());
+        self.body_used.set(true);
+        *self.body_promise.borrow_mut() = Some((p.clone(), body_type));
+    }
+
     fn is_locked(&self) -> bool {
         self.locked()
     }
 
     fn take_body(&self) -> Option<Vec<u8>> {
-        let body: NetTraitsResponseBody = mem::replace(&mut *self.body.borrow_mut(), NetTraitsResponseBody::Empty);
+        let body = mem::replace(&mut *self.body.borrow_mut(), NetTraitsResponseBody::Empty);
         match body {
-            NetTraitsResponseBody::Done(bytes) | NetTraitsResponseBody::Receiving(bytes) => {
-                self.body_used.set(true);
+            NetTraitsResponseBody::Done(bytes) => {
                 Some(bytes)
             },
-            _ => None,
+            body => {
+                mem::replace(&mut *self.body.borrow_mut(), body);
+                None
+            },
         }
     }
 
@@ -366,4 +377,12 @@ impl Response {
     pub fn set_final_url(&self, final_url: Url) {
         *self.url.borrow_mut() = Some(final_url);
     }
+
+    #[allow(unrooted_must_root)]
+    pub fn finish(&self, body: Vec<u8>) {
+        *self.body.borrow_mut() = NetTraitsResponseBody::Done(body);
+        if let Some((p, body_type)) = self.body_promise.borrow_mut().take() {
+            consume_body_with_promise(self, body_type, &p);
+        }
+    }
 }
diff --git a/components/script/fetch.rs b/components/script/fetch.rs
index d60d174daad..634439c7c7d 100644
--- a/components/script/fetch.rs
+++ b/components/script/fetch.rs
@@ -24,6 +24,7 @@ use net_traits::CoreResourceMsg::Fetch as NetTraitsFetch;
 use net_traits::request::Request as NetTraitsRequest;
 use net_traits::request::RequestInit as NetTraitsRequestInit;
 use network_listener::{NetworkListener, PreInvoke};
+use std::mem;
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 use url::Url;
@@ -31,6 +32,7 @@ use url::Url;
 struct FetchContext {
     fetch_promise: Option<TrustedPromise>,
     response_object: Trusted<Response>,
+    body: Vec<u8>,
 }
 
 fn from_referrer_to_referrer_url(request: &NetTraitsRequest) -> Option<Url> {
@@ -89,6 +91,7 @@ pub fn Fetch(global: GlobalRef, input: RequestOrUSVString, init: &RequestInit) -
     let fetch_context = Arc::new(Mutex::new(FetchContext {
         fetch_promise: Some(TrustedPromise::new(promise.clone())),
         response_object: Trusted::new(&*response),
+        body: vec![],
     }));
     let listener = NetworkListener {
         context: fetch_context,
@@ -153,12 +156,16 @@ impl FetchResponseListener for FetchContext {
         self.fetch_promise = Some(TrustedPromise::new(promise));
     }
 
-    fn process_response_chunk(&mut self, _chunk: Vec<u8>) {
-        // TODO when body is implemented
-        // ... this will append the chunk to Response's body.
+    fn process_response_chunk(&mut self, mut chunk: Vec<u8>) {
+        self.body.append(&mut chunk);
     }
 
     fn process_response_eof(&mut self, _response: Result<(), NetworkError>) {
+        let response = self.response_object.root();
+        let global = response.global();
+        let cx = global.r().get_cx();
+        let _ac = JSAutoCompartment::new(cx, global.r().reflector().get_jsobject().get());
+        response.finish(mem::replace(&mut self.body, vec![]));
         // TODO
         // ... trailerObject is not supported in Servo yet.
     }
diff --git a/tests/wpt/metadata/fetch/api/basic/text-utf8.html.ini b/tests/wpt/metadata/fetch/api/basic/text-utf8.html.ini
index 5d9acb63606..1bdc4f3f39d 100644
--- a/tests/wpt/metadata/fetch/api/basic/text-utf8.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/text-utf8.html.ini
@@ -18,45 +18,21 @@
   [UTF-8 without BOM with Response.text()]
     expected: FAIL
 
-  [UTF-8 without BOM with fetched data (UTF-8 charset)]
-    expected: FAIL
-
-  [UTF-8 without BOM with fetched data (UTF-16 charset)]
-    expected: FAIL
-
   [UTF-16BE with BOM decoded as UTF-8 with Request.text()]
     expected: FAIL
 
   [UTF-16BE with BOM decoded as UTF-8 with Response.text()]
     expected: FAIL
 
-  [UTF-16BE with BOM decoded as UTF-8 with fetched data (UTF-8 charset)]
-    expected: FAIL
-
-  [UTF-16BE with BOM decoded as UTF-8 with fetched data (UTF-16 charset)]
-    expected: FAIL
-
   [UTF-16LE with BOM decoded as UTF-8 with Request.text()]
     expected: FAIL
 
   [UTF-16LE with BOM decoded as UTF-8 with Response.text()]
     expected: FAIL
 
-  [UTF-16LE with BOM decoded as UTF-8 with fetched data (UTF-8 charset)]
-    expected: FAIL
-
-  [UTF-16LE with BOM decoded as UTF-8 with fetched data (UTF-16 charset)]
-    expected: FAIL
-
   [UTF-16 without BOM decoded as UTF-8 with Request.text()]
     expected: FAIL
 
   [UTF-16 without BOM decoded as UTF-8 with Response.text()]
     expected: FAIL
 
-  [UTF-16 without BOM decoded as UTF-8 with fetched data (UTF-8 charset)]
-    expected: FAIL
-
-  [UTF-16 without BOM decoded as UTF-8 with fetched data (UTF-16 charset)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/request/request-consume-empty.html.ini b/tests/wpt/metadata/fetch/api/request/request-consume-empty.html.ini
index 367e9eef15b..848a39ee5a6 100644
--- a/tests/wpt/metadata/fetch/api/request/request-consume-empty.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-consume-empty.html.ini
@@ -12,3 +12,12 @@
   [Consume empty text request body as arrayBuffer]
     expected: FAIL
 
+  [Consume request's body as text]
+    expected: FAIL
+
+  [Consume request's body as blob]
+    expected: FAIL
+
+  [Consume request's body as json]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/request/request-disturbed.html.ini b/tests/wpt/metadata/fetch/api/request/request-disturbed.html.ini
index 60d69c8caef..66204f04702 100644
--- a/tests/wpt/metadata/fetch/api/request/request-disturbed.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-disturbed.html.ini
@@ -12,3 +12,6 @@
   [Request construction failure should not set "bodyUsed"]
     expected: FAIL
 
+  [Request without body cannot be disturbed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/response/response-consume-empty.html.ini b/tests/wpt/metadata/fetch/api/response/response-consume-empty.html.ini
index 9ee927624fb..b7af3cd4719 100644
--- a/tests/wpt/metadata/fetch/api/response/response-consume-empty.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-consume-empty.html.ini
@@ -1,14 +1,30 @@
 [response-consume-empty.html]
   type: testharness
+  expected: TIMEOUT
   [Consume response's body as arrayBuffer]
-    expected: FAIL
+    expected: NOTRUN
 
   [Consume response's body as formData]
-    expected: FAIL
+    expected: NOTRUN
 
   [Consume empty blob response body as arrayBuffer]
-    expected: FAIL
+    expected: NOTRUN
 
   [Consume empty text response body as arrayBuffer]
-    expected: FAIL
+    expected: NOTRUN
+
+  [Consume response's body as text]
+    expected: TIMEOUT
+
+  [Consume response's body as blob]
+    expected: NOTRUN
+
+  [Consume response's body as json]
+    expected: NOTRUN
+
+  [Consume empty blob response body as text]
+    expected: NOTRUN
+
+  [Consume empty text response body as text]
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/response/response-consume.html.ini b/tests/wpt/metadata/fetch/api/response/response-consume.html.ini
index 63000272391..a0956648b51 100644
--- a/tests/wpt/metadata/fetch/api/response/response-consume.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-consume.html.ini
@@ -21,12 +21,6 @@
   [Consume stream response's body as arrayBuffer]
     expected: FAIL
 
-  [Consume fetched response's body as blob]
-    expected: FAIL
-
-  [Consume fetched response's body as text]
-    expected: FAIL
-
   [Consume fetched response's body as arrayBuffer]
     expected: FAIL
 

From cd47e214f0fef017cf6d571235676f6e8f17eba3 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Wed, 5 Oct 2016 15:26:11 +0200
Subject: [PATCH 2/2] Enable some referrer-policy tests now that they no longer
 time out.

---
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../insecure-protocol.keep-origin-redirect.http.html.ini    | 3 +--
 .../insecure-protocol.no-redirect.http.html.ini             | 3 +--
 .../insecure-protocol.swap-origin-redirect.http.html.ini    | 3 +--
 .../http-rp/same-origin/http-http/fetch-request/__dir__.ini | 1 -
 .../insecure-protocol.keep-origin-redirect.http.html.ini    | 3 +--
 .../insecure-protocol.no-redirect.http.html.ini             | 3 +--
 .../insecure-protocol.swap-origin-redirect.http.html.ini    | 3 +--
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../generic.keep-origin-redirect.http.html.ini              | 6 ------
 .../fetch-request/generic.no-redirect.http.html.ini         | 6 ------
 .../generic.swap-origin-redirect.http.html.ini              | 6 ------
 .../http-rp/same-origin/http-http/fetch-request/__dir__.ini | 1 -
 .../generic.keep-origin-redirect.http.html.ini              | 6 ------
 .../fetch-request/generic.no-redirect.http.html.ini         | 6 ------
 .../generic.swap-origin-redirect.http.html.ini              | 6 ------
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../cross-origin.keep-origin-redirect.http.html.ini         | 3 +--
 .../fetch-request/cross-origin.no-redirect.http.html.ini    | 3 +--
 .../cross-origin.swap-origin-redirect.http.html.ini         | 3 +--
 .../http-rp/same-origin/http-http/fetch-request/__dir__.ini | 1 -
 .../same-origin-insecure.keep-origin-redirect.http.html.ini | 3 +--
 .../same-origin-insecure.no-redirect.http.html.ini          | 3 +--
 .../same-origin-insecure.swap-origin-redirect.http.html.ini | 3 +--
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../generic.keep-origin-redirect.http.html.ini              | 3 +--
 .../fetch-request/generic.no-redirect.http.html.ini         | 3 +--
 .../generic.swap-origin-redirect.http.html.ini              | 3 +--
 .../http-rp/same-origin/http-http/fetch-request/__dir__.ini | 1 -
 .../generic.keep-origin-redirect.http.html.ini              | 3 +--
 .../fetch-request/generic.no-redirect.http.html.ini         | 3 +--
 .../generic.swap-origin-redirect.http.html.ini              | 3 +--
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../generic.keep-origin-redirect.http.html.ini              | 3 +--
 .../fetch-request/generic.no-redirect.http.html.ini         | 3 +--
 .../generic.swap-origin-redirect.http.html.ini              | 3 +--
 .../same-origin/http-http/fetch-request/__dir__.ini         | 1 -
 .../generic.keep-origin-redirect.http.html.ini              | 3 +--
 .../fetch-request/generic.no-redirect.http.html.ini         | 3 +--
 .../generic.swap-origin-redirect.http.html.ini              | 3 +--
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../cross-origin.keep-origin-redirect.http.html.ini         | 6 ------
 .../fetch-request/cross-origin.no-redirect.http.html.ini    | 6 ------
 .../cross-origin.swap-origin-redirect.http.html.ini         | 6 ------
 .../http-rp/same-origin/http-http/fetch-request/__dir__.ini | 1 -
 .../same-origin-insecure.keep-origin-redirect.http.html.ini | 3 +--
 .../same-origin-insecure.no-redirect.http.html.ini          | 3 +--
 .../same-origin-insecure.swap-origin-redirect.http.html.ini | 6 ------
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../cross-origin.keep-origin-redirect.http.html.ini         | 6 ------
 .../fetch-request/cross-origin.no-redirect.http.html.ini    | 6 ------
 .../cross-origin.swap-origin-redirect.http.html.ini         | 6 ------
 .../same-origin/http-http/fetch-request/__dir__.ini         | 1 -
 .../same-origin-insecure.keep-origin-redirect.http.html.ini | 3 +--
 .../same-origin-insecure.no-redirect.http.html.ini          | 3 +--
 .../same-origin-insecure.swap-origin-redirect.http.html.ini | 6 ------
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../cross-insecure.keep-origin-redirect.http.html.ini       | 3 +--
 .../fetch-request/cross-insecure.no-redirect.http.html.ini  | 3 +--
 .../cross-insecure.swap-origin-redirect.http.html.ini       | 3 +--
 .../http-rp/same-origin/http-http/fetch-request/__dir__.ini | 1 -
 .../same-insecure.keep-origin-redirect.http.html.ini        | 3 +--
 .../fetch-request/same-insecure.no-redirect.http.html.ini   | 3 +--
 .../same-insecure.swap-origin-redirect.http.html.ini        | 3 +--
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../cross-insecure.keep-origin-redirect.http.html.ini       | 3 +--
 .../fetch-request/cross-insecure.no-redirect.http.html.ini  | 3 +--
 .../cross-insecure.swap-origin-redirect.http.html.ini       | 3 +--
 .../same-origin/http-http/fetch-request/__dir__.ini         | 1 -
 .../same-insecure.keep-origin-redirect.http.html.ini        | 3 +--
 .../fetch-request/same-insecure.no-redirect.http.html.ini   | 3 +--
 .../same-insecure.swap-origin-redirect.http.html.ini        | 3 +--
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../insecure-protocol.keep-origin-redirect.http.html.ini    | 3 +--
 .../insecure-protocol.no-redirect.http.html.ini             | 3 +--
 .../insecure-protocol.swap-origin-redirect.http.html.ini    | 3 +--
 .../http-rp/same-origin/http-http/fetch-request/__dir__.ini | 1 -
 .../insecure-protocol.keep-origin-redirect.http.html.ini    | 3 +--
 .../insecure-protocol.no-redirect.http.html.ini             | 3 +--
 .../insecure-protocol.swap-origin-redirect.http.html.ini    | 3 +--
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../insecure-protocol.keep-origin-redirect.http.html.ini    | 3 +--
 .../insecure-protocol.no-redirect.http.html.ini             | 3 +--
 .../insecure-protocol.swap-origin-redirect.http.html.ini    | 3 +--
 .../same-origin/http-http/fetch-request/__dir__.ini         | 1 -
 .../insecure-protocol.keep-origin-redirect.http.html.ini    | 3 +--
 .../insecure-protocol.no-redirect.http.html.ini             | 3 +--
 .../insecure-protocol.swap-origin-redirect.http.html.ini    | 3 +--
 .../cross-origin/http-http/fetch-request/__dir__.ini        | 1 -
 .../generic.keep-origin-redirect.http.html.ini              | 3 +--
 .../fetch-request/generic.no-redirect.http.html.ini         | 3 +--
 .../generic.swap-origin-redirect.http.html.ini              | 3 +--
 .../http-rp/same-origin/http-http/fetch-request/__dir__.ini | 1 -
 .../generic.keep-origin-redirect.http.html.ini              | 3 +--
 .../fetch-request/generic.no-redirect.http.html.ini         | 3 +--
 .../generic.swap-origin-redirect.http.html.ini              | 3 +--
 96 files changed, 58 insertions(+), 224 deletions(-)
 delete mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
 delete mode 100644 tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/__dir__.ini

diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/__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/fetch-request/__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/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
index 2680adb4b67..41a0a931214 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
index 9750909f302..8ab0d521ed4 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
index 95185f237f9..43a4d49126c 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/__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/fetch-request/__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/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
index 8d1261b4ede..d53f2ccc54b 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
index 569bd1486f4..331aa970c8a 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
index 891a23ee5dd..13efeb6d82e 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/__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/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 17d5d4dfd83..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
deleted file mode 100644
index 2d47d3135d1..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 660a7074295..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/__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/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 8dbffba79a1..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
deleted file mode 100644
index 8c647ba10d0..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index db83caaad48..00000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/__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/fetch-request/__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/fetch-request/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
index bae17003e34..80300c42c5e 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
index 02da26c9c35..a62bae6bc26 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
index ade2dcda637..8dfc16a79fc 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/__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/fetch-request/__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/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
index 7aa3e96176d..a85bd56e012 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
index 4e9b1312c1e..17bd79ea9ff 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
index 988019c9a60..695ff86cf08 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/__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/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
index 662fd6c46b3..2f758102027 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
index 0928d8875c6..0b7b61a419e 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
index 69c849bf5d8..39611459890 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/__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/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
index 2f8b7f356d5..910808ae70c 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
index c75859037cf..df70ea1c3d0 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
index f0bcf209980..cf8ce3c2cac 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/__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/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
index d3120f417b6..8462bac3191 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
index 69e84b879e1..2434bd4f3ec 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
index c0363510707..69dbdda243c 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/__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/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
index bebb94deaa4..2c2e7464691 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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 same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
index 7adb828e3c7..a5488b175a5 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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 same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
index 0d7f04b8333..4e64cdd2a49 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/__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/fetch-request/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 3342db31e30..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index 7af604a5069..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index d738215d2b2..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/__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/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
index 7aa3e96176d..a85bd56e012 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
index 4e9b1312c1e..17bd79ea9ff 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index e44bc8981ca..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/__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/fetch-request/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index ff0b6b1ebc5..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index 947d673e6c1..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 91c1cae22a6..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/__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/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
index 4da6ea9765d..faec47b11a4 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
index fad1879dd8f..df853397bb6 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 21614210557..00000000000
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-http/fetch-request/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  expected: TIMEOUT
-  [The referrer URL is omitted 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: NOTRUN
-
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/__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/fetch-request/__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/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
index cd90d866b60..94fb5992123 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
index fba2add3e58..fe0a24cc2fc 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
index cc19a5f61ff..fbe22aac255 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/__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/fetch-request/__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/fetch-request/same-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
index 2f2c58f309e..8ac60cea96f 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
index bbfd46731fb..d583908fbd4 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
index 3caae65af31..d8f181549fc 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/http-rp/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/__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/fetch-request/__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/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
index 14844a36de1..1281e367c97 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
index b1a7142bb06..2a7fc0b9396 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
index c430768f76c..ccb13b407eb 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/cross-origin/http-http/fetch-request/cross-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [cross-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/__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/fetch-request/__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/fetch-request/same-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
index 0b09e8ee7a6..8166043bfd5 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
index 7e072afd924..f5ef33d9e2f 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
index 01d51580ae9..573798a2662 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/meta-referrer/same-origin/http-http/fetch-request/same-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [same-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/__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/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
index 0e62fa598bf..1ed4e2ab450 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
index 91abba71975..6196d572436 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
index 52fe13d934e..3ce67af627d 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/__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/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
index 4d4133d1810..4f274c4efb4 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
index 379d1ca9519..a83fa3bda82 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
index 35d5d1b279e..4349d619e4f 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/http-rp/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [The referrer URL is origin 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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/__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/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
index 8e0ac34e08f..58e9db44ae0 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
index dec31592ea0..86ed60f5c67 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
index ffd86b9e51f..90ac54cd4c6 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/cross-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/__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/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
index 3ff49d9e685..1222a157e26 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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 same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
index 862909bdb3c..62134c66599 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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 same-origin.]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
index e29d97cefc5..644422b2aba 100644
--- a/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/meta-referrer/same-origin/http-http/fetch-request/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/__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/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
index c898fa80241..6932397cb65 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
index 8e5c95601e0..62d7f6bcea4 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
index d1490636461..d5c72f286bd 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/__dir__.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/__dir__.ini
deleted file mode 100644
index ce7e7f59d8e..00000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/__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/fetch-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
index 628f42bed07..9a81ebc8043 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
index b69578af3ec..93161ee90ca 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.no-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
index a4d8fc95ea0..b58a5f8d6cc 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-http/fetch-request/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,5 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
   [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: NOTRUN
+    expected: FAIL