diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index c0e01ef5dd7..29b7b73d5b3 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -5631,7 +5631,7 @@ pub fn determine_policy_for_token(token: &str) -> Option<ReferrerPolicy> {
         "default" | "strict-origin-when-cross-origin" => Some(ReferrerPolicy::StrictOriginWhenCrossOrigin),
         "origin-when-cross-origin" => Some(ReferrerPolicy::OriginWhenCrossOrigin),
         "always" | "unsafe-url" => Some(ReferrerPolicy::UnsafeUrl),
-        "" => Some(ReferrerPolicy::NoReferrer),
+        "" => Some(ReferrerPolicy::default()),
         _ => None,
     }
 }
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index d26557985e1..b8cb5d15f62 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -1519,8 +1519,8 @@ pub fn parse_a_sizes_attribute(value: DOMString) -> SourceSizeList {
 
 fn get_correct_referrerpolicy_from_raw_token(token: &DOMString) -> DOMString {
     if token == "" {
-        // Empty token is treated as no-referrer inside determine_policy_for_token,
-        // while here it should be treated as the default value, so it should remain unchanged.
+        // Empty token is treated as the default referrer policy inside determine_policy_for_token,
+        // so it should remain unchanged.
         DOMString::new()
     } else {
         match determine_policy_for_token(token) {
@@ -1532,6 +1532,7 @@ fn get_correct_referrerpolicy_from_raw_token(token: &DOMString) -> DOMString {
     }
 }
 
+#[allow(non_snake_case)]
 impl HTMLImageElementMethods for HTMLImageElement {
     // https://html.spec.whatwg.org/multipage/#dom-image
     fn Image(
diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs
index 61f1f408260..2c6fb480c86 100644
--- a/components/script/dom/request.rs
+++ b/components/script/dom/request.rs
@@ -805,7 +805,7 @@ impl From<NetTraitsRequestMode> for RequestMode {
 impl From<ReferrerPolicy> for MsgReferrerPolicy {
     fn from(policy: ReferrerPolicy) -> Self {
         match policy {
-            ReferrerPolicy::_empty => MsgReferrerPolicy::NoReferrer,
+            ReferrerPolicy::_empty => MsgReferrerPolicy::default(),
             ReferrerPolicy::No_referrer => MsgReferrerPolicy::NoReferrer,
             ReferrerPolicy::No_referrer_when_downgrade => {
                 MsgReferrerPolicy::NoReferrerWhenDowngrade
diff --git a/tests/wpt/meta-legacy-layout/fetch/api/cors/cors-preflight-referrer.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/api/cors/cors-preflight-referrer.any.js.ini
index 67761dcb248..695ca95fe10 100644
--- a/tests/wpt/meta-legacy-layout/fetch/api/cors/cors-preflight-referrer.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/api/cors/cors-preflight-referrer.any.js.ini
@@ -1,21 +1,8 @@
 [cors-preflight-referrer.any.worker.html]
   type: testharness
-  [Referrer policy: "" and referrer: default]
-    expected: FAIL
-
-  [Referrer policy: "" and referrer: 'myreferrer']
-    expected: FAIL
-
   [cors-preflight-referrer]
     expected: FAIL
 
 
 [cors-preflight-referrer.any.html]
   type: testharness
-  [Referrer policy: "" and referrer: default]
-    expected: FAIL
-
-  [Referrer policy: "" and referrer: 'myreferrer']
-    expected: FAIL
-
-
diff --git a/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-referrer.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-referrer.any.js.ini
index b58c4d580b6..69b51ed3725 100644
--- a/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-referrer.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-referrer.any.js.ini
@@ -1,84 +1,6 @@
 [redirect-referrer.any.worker.html]
-  [Same origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, same-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL
-
   [redirect-referrer]
     expected: FAIL
 
 
 [redirect-referrer.any.html]
-  [Same origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, same-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL
-
diff --git a/tests/wpt/meta/fetch/api/cors/cors-preflight-referrer.any.js.ini b/tests/wpt/meta/fetch/api/cors/cors-preflight-referrer.any.js.ini
deleted file mode 100644
index fd270b4353a..00000000000
--- a/tests/wpt/meta/fetch/api/cors/cors-preflight-referrer.any.js.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-[cors-preflight-referrer.any.worker.html]
-  [Referrer policy: "" and referrer: default]
-    expected: FAIL
-
-  [Referrer policy: "" and referrer: 'myreferrer']
-    expected: FAIL
-
-
-[cors-preflight-referrer.any.html]
-  [Referrer policy: "" and referrer: default]
-    expected: FAIL
-
-  [Referrer policy: "" and referrer: 'myreferrer']
-    expected: FAIL
diff --git a/tests/wpt/meta/fetch/api/redirect/redirect-referrer.any.js.ini b/tests/wpt/meta/fetch/api/redirect/redirect-referrer.any.js.ini
deleted file mode 100644
index 626b9f7bf5e..00000000000
--- a/tests/wpt/meta/fetch/api/redirect/redirect-referrer.any.js.ini
+++ /dev/null
@@ -1,80 +0,0 @@
-[redirect-referrer.any.html]
-  [Same origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, same-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-
-[redirect-referrer.any.worker.html]
-  [Same origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, same-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL