diff --git a/components/msg/constellation_msg.rs b/components/msg/constellation_msg.rs
index 14991a75aec6..7e64619db691 100644
--- a/components/msg/constellation_msg.rs
+++ b/components/msg/constellation_msg.rs
@@ -358,7 +358,7 @@ pub enum FrameType {
 
 /// [Policies](https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-states)
 /// for providing a referrer header for a request
-#[derive(HeapSizeOf, Clone, Deserialize, Serialize)]
+#[derive(Clone, Copy, Debug, Deserialize, HeapSizeOf, Serialize)]
 pub enum ReferrerPolicy {
     NoReferrer,
     NoRefWhenDowngrade,
diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs
index 5c62e29cf387..a6b810cc18aa 100644
--- a/components/net/http_loader.rs
+++ b/components/net/http_loader.rs
@@ -596,7 +596,8 @@ pub fn modify_request_headers(headers: &mut Headers,
                               cookie_jar: &Arc<RwLock<CookieStorage>>,
                               auth_cache: &Arc<RwLock<AuthCache>>,
                               load_data: &LoadData,
-                              block_cookies: bool) {
+                              block_cookies: bool,
+                              referrer_url: &mut Option<Url>) {
     // Ensure that the host header is set from the original url
     let host = Host {
         hostname: url.host_str().unwrap().to_owned(),
@@ -617,10 +618,12 @@ pub fn modify_request_headers(headers: &mut Headers,
     set_default_accept(headers);
     set_default_accept_encoding(headers);
 
-    if let Some(referer_val) = determine_request_referrer(headers,
-                                                          load_data.referrer_policy.clone(),
-                                                          load_data.referrer_url.clone(),
-                                                          url.clone()) {
+    *referrer_url = determine_request_referrer(headers,
+                                               load_data.referrer_policy.clone(),
+                                               referrer_url.clone(),
+                                               url.clone());
+
+    if let Some(referer_val) = referrer_url.clone() {
         headers.set(Referer(referer_val.into_string()));
     }
 
@@ -808,6 +811,8 @@ pub fn load<A, B>(load_data: &LoadData,
     let mut doc_url = load_data.url.clone();
     let mut redirected_to = HashSet::new();
     let mut method = load_data.method.clone();
+    // URL of referrer - to be updated with redirects
+    let mut referrer_url = load_data.referrer_url.clone();
 
     let mut new_auth_header: Option<Authorization<Basic>> = None;
 
@@ -901,7 +906,8 @@ pub fn load<A, B>(load_data: &LoadData,
 
         modify_request_headers(&mut request_headers, &doc_url,
                                &user_agent, &http_state.cookie_jar,
-                               &http_state.auth_cache, &load_data, block_cookies);
+                               &http_state.auth_cache, &load_data,
+                               block_cookies, &mut referrer_url);
 
         //if there is a new auth header then set the request headers with it
         if let Some(ref auth_header) = new_auth_header {
diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs
index dcd85c3af72a..1f6380517699 100644
--- a/components/net_traits/lib.rs
+++ b/components/net_traits/lib.rs
@@ -140,7 +140,7 @@ impl LoadData {
             credentials_flag: true,
             context: context,
             referrer_policy: load_origin.referrer_policy(),
-            referrer_url: load_origin.referrer_url(),
+            referrer_url: load_origin.referrer_url().clone(),
             source: load_origin.request_source()
         }
     }
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index a12f122e2c6c..486d95d6c63c 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -238,7 +238,7 @@ pub struct Document {
     /// The document's origin.
     origin: Origin,
     ///  https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-states
-    referrer_policy: Option<ReferrerPolicy>,
+    referrer_policy: Cell<Option<ReferrerPolicy>>,
 }
 
 #[derive(JSTraceable, HeapSizeOf)]
@@ -1700,7 +1700,7 @@ impl Document {
             touchpad_pressure_phase: Cell::new(TouchpadPressurePhase::BeforeClick),
             origin: origin,
             //TODO - setting this for now so no Referer header set
-            referrer_policy: Some(ReferrerPolicy::NoReferrer),
+            referrer_policy: Cell::new(Some(ReferrerPolicy::NoReferrer)),
         }
     }
 
@@ -1830,9 +1830,13 @@ impl Document {
         }
     }
 
-    //TODO - for now, returns no-referrer for all until reading in the value
+    pub fn set_referrer_policy(&self, policy: Option<ReferrerPolicy>) {
+        self.referrer_policy.set(policy);
+    }
+
+    //TODO - default still at no-referrer
     pub fn get_referrer_policy(&self) -> Option<ReferrerPolicy> {
-        return self.referrer_policy.clone();
+        return self.referrer_policy.get();
     }
 }
 
@@ -2803,6 +2807,20 @@ fn update_with_current_time_ms(marker: &Cell<u64>) {
     }
 }
 
+/// https://w3c.github.io/webappsec-referrer-policy/#determine-policy-for-token
+pub fn determine_policy_for_token(token: &str) -> Option<ReferrerPolicy> {
+    let lower = token.to_lowercase();
+    return match lower.as_ref() {
+        "never" | "no-referrer" => Some(ReferrerPolicy::NoReferrer),
+        "default" | "no-referrer-when-downgrade" => Some(ReferrerPolicy::NoRefWhenDowngrade),
+        "origin" => Some(ReferrerPolicy::OriginOnly),
+        "origin-when-cross-origin" => Some(ReferrerPolicy::OriginWhenCrossOrigin),
+        "always" | "unsafe-url" => Some(ReferrerPolicy::UnsafeUrl),
+        "" => Some(ReferrerPolicy::NoReferrer),
+        _ => None,
+    }
+}
+
 pub struct DocumentProgressHandler {
     addr: Trusted<Document>
 }
diff --git a/components/script/dom/htmlheadelement.rs b/components/script/dom/htmlheadelement.rs
index d6e7fe22a269..995f380f442a 100644
--- a/components/script/dom/htmlheadelement.rs
+++ b/components/script/dom/htmlheadelement.rs
@@ -2,13 +2,16 @@
  * 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 dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
 use dom::bindings::codegen::Bindings::HTMLHeadElementBinding;
 use dom::bindings::inheritance::Castable;
-use dom::bindings::js::Root;
+use dom::bindings::js::{Root, RootedReference};
 use dom::bindings::str::DOMString;
-use dom::document::Document;
+use dom::document::{Document, determine_policy_for_token};
+use dom::element::Element;
 use dom::htmlelement::HTMLElement;
-use dom::node::Node;
+use dom::htmlmetaelement::HTMLMetaElement;
+use dom::node::{Node, document_from_node};
 use dom::userscripts::load_script;
 use dom::virtualmethods::VirtualMethods;
 use string_cache::Atom;
@@ -34,6 +37,33 @@ impl HTMLHeadElement {
         let element = HTMLHeadElement::new_inherited(localName, prefix, document);
         Node::reflect_node(box element, document, HTMLHeadElementBinding::Wrap)
     }
+
+    /// https://html.spec.whatwg.org/multipage/#meta-referrer
+    pub fn set_document_referrer(&self) {
+        let doc = document_from_node(self);
+
+        if doc.GetHead().r() != Some(self) {
+            return;
+        }
+
+        let node = self.upcast::<Node>();
+        let candidates = node.traverse_preorder()
+                             .filter_map(Root::downcast::<Element>)
+                             .filter(|elem| elem.is::<HTMLMetaElement>())
+                             .filter(|elem| elem.get_string_attribute(&atom!("name")) == "referrer")
+                             .filter(|elem| elem.get_attribute(&ns!(), &atom!("content")).is_some());
+
+        for meta in candidates {
+            if let Some(content) = meta.get_attribute(&ns!(), &atom!("content")).r() {
+                let content = content.value();
+                let content_val = content.trim();
+                if !content_val.is_empty() {
+                    doc.set_referrer_policy(determine_policy_for_token(content_val));
+                    return;
+                }
+            }
+        }
+    }
 }
 
 impl VirtualMethods for HTMLHeadElement {
diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs
index 552730a2bb3f..efea0f0605fd 100644
--- a/components/script/dom/htmliframeelement.rs
+++ b/components/script/dom/htmliframeelement.rs
@@ -144,8 +144,9 @@ impl HTMLIFrameElement {
     pub fn process_the_iframe_attributes(&self) {
         let url = self.get_url();
 
-        // TODO - loaddata here should have referrer info (not None, None)
-        self.navigate_or_reload_child_browsing_context(Some(LoadData::new(url, None, None)));
+        let document = document_from_node(self);
+        self.navigate_or_reload_child_browsing_context(
+            Some(LoadData::new(url, document.get_referrer_policy(), Some(document.url().clone()))));
     }
 
     #[allow(unsafe_code)]
diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs
index bc3dfdb5b57d..13bf926cded1 100644
--- a/components/script/dom/htmlmetaelement.rs
+++ b/components/script/dom/htmlmetaelement.rs
@@ -2,17 +2,19 @@
  * 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 dom::attr::AttrValue;
+use dom::attr::{Attr, AttrValue};
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::HTMLMetaElementBinding;
 use dom::bindings::codegen::Bindings::HTMLMetaElementBinding::HTMLMetaElementMethods;
+use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
 use dom::bindings::inheritance::Castable;
 use dom::bindings::js::{Root, RootedReference};
 use dom::bindings::str::DOMString;
 use dom::document::Document;
-use dom::element::Element;
+use dom::element::{AttributeMutation, Element};
 use dom::htmlelement::HTMLElement;
-use dom::node::{Node, document_from_node};
+use dom::htmlheadelement::HTMLHeadElement;
+use dom::node::{Node, UnbindContext, document_from_node};
 use dom::virtualmethods::VirtualMethods;
 use std::ascii::AsciiExt;
 use std::sync::Arc;
@@ -59,6 +61,10 @@ impl HTMLMetaElement {
             if name == "viewport" {
                 self.apply_viewport();
             }
+
+            if name == "referrer" {
+                self.apply_referrer();
+            }
         }
     }
 
@@ -85,6 +91,27 @@ impl HTMLMetaElement {
             }
         }
     }
+
+    fn process_referrer_attribute(&self) {
+        let element = self.upcast::<Element>();
+        if let Some(name) = element.get_attribute(&ns!(), &atom!("name")).r() {
+            let name = name.value().to_ascii_lowercase();
+            let name = name.trim_matches(HTML_SPACE_CHARACTERS);
+
+            if name == "referrer" {
+                self.apply_referrer();
+            }
+        }
+    }
+
+    /// https://html.spec.whatwg.org/multipage/#meta-referrer
+    fn apply_referrer(&self) {
+        if let Some(parent) = self.upcast::<Node>().GetParentElement() {
+            if let Some(head) = parent.downcast::<HTMLHeadElement>() {
+                head.set_document_referrer();
+            }
+        }
+    }
 }
 
 impl HTMLMetaElementMethods for HTMLMetaElement {
@@ -122,4 +149,22 @@ impl VirtualMethods for HTMLMetaElement {
             _ => self.super_type().unwrap().parse_plain_attribute(name, value),
         }
     }
+
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
+        if let Some(s) = self.super_type() {
+            s.attribute_mutated(attr, mutation);
+        }
+
+        self.process_referrer_attribute();
+    }
+
+    fn unbind_from_tree(&self, context: &UnbindContext) {
+        if let Some(ref s) = self.super_type() {
+            s.unbind_from_tree(context);
+        }
+
+        if context.tree_in_doc {
+            self.process_referrer_attribute();
+        }
+    }
 }
diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs
index 743a06ff5ec6..bb5c32ed64eb 100644
--- a/components/script/dom/xmlhttprequest.rs
+++ b/components/script/dom/xmlhttprequest.rs
@@ -148,10 +148,20 @@ pub struct XMLHttpRequest {
     fetch_time: Cell<i64>,
     generation_id: Cell<GenerationId>,
     response_status: Cell<Result<(), ()>>,
+    referrer_url: Option<Url>,
+    referrer_policy: Option<ReferrerPolicy>,
 }
 
 impl XMLHttpRequest {
     fn new_inherited(global: GlobalRef) -> XMLHttpRequest {
+        //TODO - update this when referrer policy implemented for workers
+        let (referrer_url, referrer_policy) = if let GlobalRef::Window(window) = global {
+            let document = window.Document();
+            (Some(document.url().clone()), document.get_referrer_policy())
+        } else {
+            (None, None)
+        };
+
         XMLHttpRequest {
             eventtarget: XMLHttpRequestEventTarget::new_inherited(),
             ready_state: Cell::new(XMLHttpRequestState::Unsent),
@@ -183,6 +193,8 @@ impl XMLHttpRequest {
             fetch_time: Cell::new(0),
             generation_id: Cell::new(GenerationId(0)),
             response_status: Cell::new(Ok(())),
+            referrer_url: referrer_url,
+            referrer_policy: referrer_policy,
         }
     }
     pub fn new(global: GlobalRef) -> Root<XMLHttpRequest> {
@@ -297,10 +309,10 @@ impl XMLHttpRequest {
 
 impl LoadOrigin for XMLHttpRequest {
     fn referrer_url(&self) -> Option<Url> {
-        None
+        return self.referrer_url.clone();
     }
     fn referrer_policy(&self) -> Option<ReferrerPolicy> {
-        None
+        return self.referrer_policy;
     }
     fn request_source(&self) -> RequestSource {
         if self.sync.get() {
@@ -592,11 +604,12 @@ impl XMLHttpRequestMethods for XMLHttpRequest {
 
         // Step 5
         let global = self.global();
-        //TODO - set referrer_policy/referrer_url in load_data
+
         let mut load_data =
             LoadData::new(LoadContext::Browsing,
                           self.request_url.borrow().clone().unwrap(),
                           self);
+
         if load_data.url.origin().ne(&global.r().get_url().origin()) {
             load_data.credentials_flag = self.WithCredentials();
         }
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index a4b2a9b352c0..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 451814ef71a7..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 5895b7972885..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 1751c0ae4c9c..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.ini
deleted file mode 100644
index 01af595a731d..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index fe1bd2f31ab7..000000000000
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/xhr-request/insecure-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 82cb7e123407..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.ini
deleted file mode 100644
index b2ca359b3c08..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 3e34e88dfde9..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 173744893682..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html.ini
deleted file mode 100644
index d89e39ad0f36..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 6efb24e292b0..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-only/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 701a134cfee7..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index 9c9ecab22cfd..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 90fabab51322..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/xhr-request/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html.ini
deleted file mode 100644
index e75ac14beb9c..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-insecure.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html.ini
deleted file mode 100644
index e38c000d013d..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-insecure.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index db4935b27c62..000000000000
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/xhr-request/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 00d657a2e4ce..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.ini
deleted file mode 100644
index caa9d43945d9..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index a25dc7b2fda4..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 9c2b38b62848..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html.ini
deleted file mode 100644
index 4ab14787bccd..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 59ec8621c01f..000000000000
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/xhr-request/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via xhr-request using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index bdddc5d4ea87..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
deleted file mode 100644
index d3c2e5013667..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 0ce5bcfb640d..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
deleted file mode 100644
index e3ca3e23da35..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
deleted file mode 100644
index aa8825ca9865..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 49a62d07e1b9..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[insecure-protocol.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index bdbbe6c0d5ba..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 5220091d82c0..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index a66d26b054d0..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 32662c3a6a8c..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 7c94f552be2a..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 3fced6fb37a3..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-only/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 11bd327b08ce..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
deleted file mode 100644
index 812d83a253e8..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
deleted file mode 100644
index bc15e3df6d7d..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[cross-origin.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 95f762e65cf3..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-insecure.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
deleted file mode 100644
index d781230d47ba..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-insecure.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 00252cc5fff1..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[same-origin-insecure.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index db2031336f80..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 3a8131388026..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index dd0f1831b187..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
deleted file mode 100644
index 0293c6bebd70..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.keep-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
deleted file mode 100644
index 9240c8f42e3b..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.no-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
deleted file mode 100644
index 56b7cd590bbd..000000000000
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[generic.swap-origin-redirect.http.html]
-  type: testharness
-  [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
-    expected: FAIL
-