diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs
index c7a09fcc4d8..7b837df1fed 100644
--- a/components/script/dom/bindings/callback.rs
+++ b/components/script/dom/bindings/callback.rs
@@ -191,7 +191,7 @@ impl<'a> Drop for CallSetup<'a> {
             JS_LeaveCompartment(self.cx, self.old_compartment);
             if self.handling == ExceptionHandling::Report {
                 let _ac = JSAutoCompartment::new(self.cx, *self.exception_compartment);
-                report_pending_exception(self.cx);
+                report_pending_exception(self.cx, true);
             }
         }
     }
diff --git a/components/script/dom/bindings/error.rs b/components/script/dom/bindings/error.rs
index 6c26ae8502c..752f0d75b49 100644
--- a/components/script/dom/bindings/error.rs
+++ b/components/script/dom/bindings/error.rs
@@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::DOMExceptionBinding::DOMExceptionMethods;
 use dom::bindings::codegen::PrototypeList::proto_id_to_name;
 use dom::bindings::conversions::root_from_object;
 use dom::bindings::conversions::{ConversionResult, FromJSValConvertible, ToJSValConvertible};
-use dom::bindings::global::GlobalRef;
+use dom::bindings::global::{GlobalRef, global_root_from_context};
 use dom::bindings::str::USVString;
 use dom::domexception::{DOMErrorName, DOMException};
 use js::error::{throw_range_error, throw_type_error};
@@ -132,11 +132,16 @@ pub unsafe fn throw_dom_exception(cx: *mut JSContext, global: GlobalRef, result:
     JS_SetPendingException(cx, thrown.handle());
 }
 
-struct ErrorInfo {
-    filename: String,
-    message: String,
-    lineno: c_uint,
-    column: c_uint,
+/// A struct encapsulating information about a runtime script error.
+pub struct ErrorInfo {
+    /// The error message.
+    pub message: String,
+    /// The file name.
+    pub filename: String,
+    /// The line number.
+    pub lineno: c_uint,
+    /// The column number.
+    pub column: c_uint,
 }
 
 impl ErrorInfo {
@@ -192,7 +197,10 @@ impl ErrorInfo {
 }
 
 /// Report a pending exception, thereby clearing it.
-pub unsafe fn report_pending_exception(cx: *mut JSContext) {
+///
+/// The `dispatch_event` argument is temporary and non-standard; passing false
+/// prevents dispatching the `error` event.
+pub unsafe fn report_pending_exception(cx: *mut JSContext, dispatch_event: bool) {
     if JS_IsExceptionPending(cx) {
         rooted!(in(cx) let mut value = UndefinedValue());
         if !JS_GetPendingException(cx, value.handle_mut()) {
@@ -202,22 +210,31 @@ pub unsafe fn report_pending_exception(cx: *mut JSContext) {
         }
 
         JS_ClearPendingException(cx);
-        if !value.is_object() {
-            match USVString::from_jsval(cx, value.handle(), ()) {
-                Ok(ConversionResult::Success(USVString(string))) => error!("Uncaught exception: {}", string),
-                _ => error!("Uncaught exception: failed to stringify primitive"),
+        let error_info = if value.is_object() {
+            rooted!(in(cx) let object = value.to_object());
+            let error_info = ErrorInfo::from_native_error(cx, object.handle())
+                .or_else(|| ErrorInfo::from_dom_exception(object.handle()));
+            match error_info {
+                Some(error_info) => error_info,
+                None => {
+                    error!("Uncaught exception: failed to extract information");
+                    return;
+                }
             }
-            return;
-        }
-
-        rooted!(in(cx) let object = value.to_object());
-        let error_info = ErrorInfo::from_native_error(cx, object.handle())
-            .or_else(|| ErrorInfo::from_dom_exception(object.handle()));
-        let error_info = match error_info {
-            Some(error_info) => error_info,
-            None => {
-                error!("Uncaught exception: failed to extract information");
-                return;
+        } else {
+            match USVString::from_jsval(cx, value.handle(), ()) {
+                Ok(ConversionResult::Success(USVString(string))) => {
+                    ErrorInfo {
+                        message: format!("uncaught exception: {}", string),
+                        filename: String::new(),
+                        lineno: 0,
+                        column: 0,
+                    }
+                },
+                _ => {
+                    error!("Uncaught exception: failed to stringify primitive");
+                    return;
+                },
             }
         };
 
@@ -226,6 +243,13 @@ pub unsafe fn report_pending_exception(cx: *mut JSContext) {
                error_info.lineno,
                error_info.column,
                error_info.message);
+
+        if dispatch_event {
+            let global = global_root_from_context(cx);
+            if let GlobalRef::Window(window) = global.r() {
+                window.report_an_error(error_info, value.handle());
+            }
+        }
     }
 }
 
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs
index 29a6b4102f8..c941eb8e20e 100644
--- a/components/script/dom/eventtarget.rs
+++ b/components/script/dom/eventtarget.rs
@@ -427,7 +427,8 @@ impl EventTarget {
             // Step 1.8.2
             unsafe {
                 let _ac = JSAutoCompartment::new(cx, self.reflector().get_jsobject().get());
-                report_pending_exception(cx);
+                // FIXME(#13152): dispatch error event.
+                report_pending_exception(cx, false);
             }
             // Step 1.8.1 / 1.8.3
             return None;
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index b6bf6a35643..d1529b44b19 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -14,7 +14,7 @@ use dom::bindings::codegen::Bindings::FunctionBinding::Function;
 use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
 use dom::bindings::codegen::Bindings::WindowBinding::{ScrollBehavior, ScrollToOptions};
 use dom::bindings::codegen::Bindings::WindowBinding::{self, FrameRequestCallback, WindowMethods};
-use dom::bindings::error::{Error, ErrorResult, Fallible, report_pending_exception};
+use dom::bindings::error::{Error, ErrorResult, Fallible, report_pending_exception, ErrorInfo};
 use dom::bindings::global::{GlobalRef, global_root_from_object};
 use dom::bindings::inheritance::Castable;
 use dom::bindings::js::{JS, MutNullableHeap, Root};
@@ -30,7 +30,8 @@ use dom::crypto::Crypto;
 use dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration};
 use dom::document::Document;
 use dom::element::Element;
-use dom::event::Event;
+use dom::errorevent::ErrorEvent;
+use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::eventtarget::EventTarget;
 use dom::history::History;
 use dom::htmliframeelement::build_mozbrowser_custom_event;
@@ -273,6 +274,9 @@ pub struct Window {
 
     /// A list of scroll offsets for each scrollable element.
     scroll_offsets: DOMRefCell<HashMap<UntrustedNodeAddress, Point2D<f32>>>,
+
+    /// https://html.spec.whatwg.org/multipage/#in-error-reporting-mode
+    in_error_reporting_mode: Cell<bool>
 }
 
 impl Window {
@@ -952,7 +956,7 @@ impl<'a, T: Reflectable> ScriptHelpers for &'a T {
                                   code.len() as libc::size_t,
                                   rval) {
                         debug!("error evaluating JS string");
-                        report_pending_exception(cx);
+                        report_pending_exception(cx, true);
                     }
                 }
 
@@ -1742,6 +1746,7 @@ impl Window {
             ignore_further_async_events: Arc::new(AtomicBool::new(false)),
             error_reporter: error_reporter,
             scroll_offsets: DOMRefCell::new(HashMap::new()),
+            in_error_reporting_mode: Cell::new(false),
         };
 
         WindowBinding::Wrap(runtime.cx(), win)
@@ -1749,6 +1754,34 @@ impl Window {
     pub fn live_devtools_updates(&self) -> bool {
         return self.devtools_wants_updates.get();
     }
+
+    /// https://html.spec.whatwg.org/multipage/#report-the-error
+    pub fn report_an_error(&self, error_info: ErrorInfo, value: HandleValue) {
+        // Step 1.
+        if self.in_error_reporting_mode.get() {
+            return;
+        }
+
+        // Step 2.
+        self.in_error_reporting_mode.set(true);
+
+        // Steps 3-12.
+        let event = ErrorEvent::new(GlobalRef::Window(self),
+                                    atom!("error"),
+                                    EventBubbles::DoesNotBubble,
+                                    EventCancelable::Cancelable,
+                                    error_info.message.into(),
+                                    error_info.filename.into(),
+                                    error_info.lineno,
+                                    error_info.column,
+                                    value);
+
+        // Step 13.
+        event.upcast::<Event>().fire(self.upcast::<EventTarget>());
+
+        // Step 14.
+        self.in_error_reporting_mode.set(false);
+    }
 }
 
 fn should_move_clip_rect(clip_rect: Rect<Au>, new_viewport: Rect<f32>) -> bool {
diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs
index 1b3c48b9c12..9f61753ca64 100644
--- a/components/script/dom/workerglobalscope.rs
+++ b/components/script/dom/workerglobalscope.rs
@@ -384,7 +384,7 @@ impl WorkerGlobalScope {
                     unsafe {
                         let _ac = JSAutoCompartment::new(self.runtime.cx(),
                                                          self.reflector().get_jsobject().get());
-                        report_pending_exception(self.runtime.cx());
+                        report_pending_exception(self.runtime.cx(), true);
                     }
                 }
             }
diff --git a/tests/wpt/metadata-css/cssom-1_dev/html/cssstylerule.htm.ini b/tests/wpt/metadata-css/cssom-1_dev/html/cssstylerule.htm.ini
index 97917e06ed1..42a59247827 100644
--- a/tests/wpt/metadata-css/cssom-1_dev/html/cssstylerule.htm.ini
+++ b/tests/wpt/metadata-css/cssom-1_dev/html/cssstylerule.htm.ini
@@ -1,3 +1,3 @@
 [cssstylerule.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata-css/cssom-1_dev/html/index-003.htm.ini b/tests/wpt/metadata-css/cssom-1_dev/html/index-003.htm.ini
index 6e693db55f4..b23072d78f6 100644
--- a/tests/wpt/metadata-css/cssom-1_dev/html/index-003.htm.ini
+++ b/tests/wpt/metadata-css/cssom-1_dev/html/index-003.htm.ini
@@ -1,3 +1,3 @@
 [index-003.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata-css/cssom-1_dev/html/matchMedia.htm.ini b/tests/wpt/metadata-css/cssom-1_dev/html/matchMedia.htm.ini
index daabbc1209f..2a539197b3e 100644
--- a/tests/wpt/metadata-css/cssom-1_dev/html/matchMedia.htm.ini
+++ b/tests/wpt/metadata-css/cssom-1_dev/html/matchMedia.htm.ini
@@ -1,3 +1,3 @@
 [matchMedia.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata-css/cssom-view-1_dev/html/matchMedia.htm.ini b/tests/wpt/metadata-css/cssom-view-1_dev/html/matchMedia.htm.ini
index daabbc1209f..2a539197b3e 100644
--- a/tests/wpt/metadata-css/cssom-view-1_dev/html/matchMedia.htm.ini
+++ b/tests/wpt/metadata-css/cssom-view-1_dev/html/matchMedia.htm.ini
@@ -1,3 +1,3 @@
 [matchMedia.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata-css/cssom-view-1_dev/html/matchMediaAddListener.htm.ini b/tests/wpt/metadata-css/cssom-view-1_dev/html/matchMediaAddListener.htm.ini
index 344a9bed565..ffeb9814148 100644
--- a/tests/wpt/metadata-css/cssom-view-1_dev/html/matchMediaAddListener.htm.ini
+++ b/tests/wpt/metadata-css/cssom-view-1_dev/html/matchMediaAddListener.htm.ini
@@ -1,3 +1,3 @@
 [matchMediaAddListener.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/WebCryptoAPI/digest/test_digest.html.ini b/tests/wpt/metadata/WebCryptoAPI/digest/test_digest.html.ini
index 12a8e7a456e..e6b83e69ffb 100644
--- a/tests/wpt/metadata/WebCryptoAPI/digest/test_digest.html.ini
+++ b/tests/wpt/metadata/WebCryptoAPI/digest/test_digest.html.ini
@@ -1,5 +1,6 @@
 [test_digest.html]
   type: testharness
+  expected: ERROR
   [SHA-1 with empty source data]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_cbc.html.ini b/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_cbc.html.ini
index 64813e32026..d3f3666db2c 100644
--- a/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_cbc.html.ini
+++ b/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_cbc.html.ini
@@ -1,3 +1,3 @@
 [test_aes_cbc.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_ctr.html.ini b/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_ctr.html.ini
index defde57339d..6b5d4b8d2a7 100644
--- a/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_ctr.html.ini
+++ b/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_ctr.html.ini
@@ -1,3 +1,3 @@
 [test_aes_ctr.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_gcm.html.ini b/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_gcm.html.ini
index 1345145f8ef..34d2f30b48c 100644
--- a/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_gcm.html.ini
+++ b/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_aes_gcm.html.ini
@@ -1,3 +1,3 @@
 [test_aes_gcm.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_rsa_oaep.html.ini b/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_rsa_oaep.html.ini
index 4b37722a2a4..b4772cdd379 100644
--- a/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_rsa_oaep.html.ini
+++ b/tests/wpt/metadata/WebCryptoAPI/encrypt_decrypt/test_rsa_oaep.html.ini
@@ -1,3 +1,3 @@
 [test_rsa_oaep.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/XMLHttpRequest/open-url-multi-window-6.htm.ini b/tests/wpt/metadata/XMLHttpRequest/open-url-multi-window-6.htm.ini
index 2f530615db1..50740305a60 100644
--- a/tests/wpt/metadata/XMLHttpRequest/open-url-multi-window-6.htm.ini
+++ b/tests/wpt/metadata/XMLHttpRequest/open-url-multi-window-6.htm.ini
@@ -1,6 +1,6 @@
 [open-url-multi-window-6.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [XMLHttpRequest: open() in document that is not fully active (but may be active) should throw]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/dom/events/Event-dispatch-throwing.html.ini b/tests/wpt/metadata/dom/events/Event-dispatch-throwing.html.ini
deleted file mode 100644
index a4a0a2984a8..00000000000
--- a/tests/wpt/metadata/dom/events/Event-dispatch-throwing.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[Event-dispatch-throwing.html]
-  type: testharness
-  [Throwing in event listener with a single listeners]
-    expected: FAIL
-
-  [Throwing in event listener with multiple listeners]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html.ini b/tests/wpt/metadata/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html.ini
index f093f1ded77..737a76f0227 100644
--- a/tests/wpt/metadata/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html.ini
+++ b/tests/wpt/metadata/dom/nodes/Element-getElementsByTagName-change-document-HTMLNess.html.ini
@@ -1,6 +1,5 @@
 [Element-getElementsByTagName-change-document-HTMLNess.html]
   type: testharness
-  expected: TIMEOUT
   [Untitled]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/request/request-cache.html.ini b/tests/wpt/metadata/fetch/api/request/request-cache.html.ini
index d7fe7a80d22..f9bf8428a70 100644
--- a/tests/wpt/metadata/fetch/api/request/request-cache.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-cache.html.ini
@@ -1,5 +1,6 @@
 [request-cache.html]
   type: testharness
+  expected: ERROR
   [RequestCache "default" mode checks the cache for previously cached content and goes to the network for stale responses with Etag and stale response]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/request/request-clone.sub.html.ini b/tests/wpt/metadata/fetch/api/request/request-clone.sub.html.ini
index 2c21911f957..82cde19ce37 100644
--- a/tests/wpt/metadata/fetch/api/request/request-clone.sub.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-clone.sub.html.ini
@@ -1,3 +1,3 @@
 [request-clone.sub.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
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 e0101fd9b2b..e50ab07ae2a 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
@@ -1,5 +1,6 @@
 [request-consume-empty.html]
   type: testharness
+  expected: ERROR
   [Consume request's body as text]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/request/request-consume.html.ini b/tests/wpt/metadata/fetch/api/request/request-consume.html.ini
index 75e18b2bfe4..2493d1473c9 100644
--- a/tests/wpt/metadata/fetch/api/request/request-consume.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-consume.html.ini
@@ -1,5 +1,6 @@
 [request-consume.html]
   type: testharness
+  expected: ERROR
   [Consume request's body as text]
     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 a2b95d17574..2eed840f857 100644
--- a/tests/wpt/metadata/fetch/api/request/request-disturbed.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-disturbed.html.ini
@@ -1,3 +1,3 @@
 [request-disturbed.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/fetch/api/request/request-init-002.html.ini b/tests/wpt/metadata/fetch/api/request/request-init-002.html.ini
index 5d57d8d8684..34c703c4aba 100644
--- a/tests/wpt/metadata/fetch/api/request/request-init-002.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-init-002.html.ini
@@ -1,5 +1,6 @@
 [request-init-002.html]
   type: testharness
+  expected: ERROR
   [Initialize Request with headers values]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/request/request-init-003.sub.html.ini b/tests/wpt/metadata/fetch/api/request/request-init-003.sub.html.ini
index 39385626add..83baaaab7f1 100644
--- a/tests/wpt/metadata/fetch/api/request/request-init-003.sub.html.ini
+++ b/tests/wpt/metadata/fetch/api/request/request-init-003.sub.html.ini
@@ -1,3 +1,3 @@
 [request-init-003.sub.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/fetch/api/response/response-cancel-stream.html.ini b/tests/wpt/metadata/fetch/api/response/response-cancel-stream.html.ini
index be76aacfd32..58237104f8b 100644
--- a/tests/wpt/metadata/fetch/api/response/response-cancel-stream.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-cancel-stream.html.ini
@@ -1,5 +1,6 @@
 [response-cancel-stream.html]
   type: testharness
+  expected: ERROR
   [Cancelling a starting blob Response stream]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/response/response-clone.html.ini b/tests/wpt/metadata/fetch/api/response/response-clone.html.ini
index 94b4e987938..a570446c57c 100644
--- a/tests/wpt/metadata/fetch/api/response/response-clone.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-clone.html.ini
@@ -1,3 +1,3 @@
 [response-clone.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
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 f0fa305c15b..d5a984585f9 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,5 +1,6 @@
 [response-consume-empty.html]
   type: testharness
+  expected: ERROR
   [Consume response's body as text]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/response/response-consume-stream.html.ini b/tests/wpt/metadata/fetch/api/response/response-consume-stream.html.ini
index 04287d6d68c..3d642c940ff 100644
--- a/tests/wpt/metadata/fetch/api/response/response-consume-stream.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-consume-stream.html.ini
@@ -1,5 +1,6 @@
 [response-consume-stream.html]
   type: testharness
+  expected: ERROR
   [Read empty text response's body as readableStream]
     expected: FAIL
 
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 97139ca9e82..aee0ff74cf1 100644
--- a/tests/wpt/metadata/fetch/api/response/response-consume.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-consume.html.ini
@@ -1,5 +1,6 @@
 [response-consume.html]
   type: testharness
+  expected: ERROR
   [Consume response's body as text]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/response/response-init-001.html.ini b/tests/wpt/metadata/fetch/api/response/response-init-001.html.ini
index e731802d714..132f3e5549d 100644
--- a/tests/wpt/metadata/fetch/api/response/response-init-001.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-init-001.html.ini
@@ -1,3 +1,3 @@
 [response-init-001.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/fetch/api/response/response-init-002.html.ini b/tests/wpt/metadata/fetch/api/response/response-init-002.html.ini
index d71723c7593..49a729ba72e 100644
--- a/tests/wpt/metadata/fetch/api/response/response-init-002.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-init-002.html.ini
@@ -1,5 +1,6 @@
 [response-init-002.html]
   type: testharness
+  expected: ERROR
   [Initialize Response with headers values]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-1.html.ini b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-1.html.ini
index a6ec197400f..4c28dac3f46 100644
--- a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-1.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-1.html.ini
@@ -1,5 +1,6 @@
 [response-stream-disturbed-1.html]
   type: testharness
+  expected: ERROR
   [Getting blob after getting the Response body - not disturbed, not locked]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-2.html.ini b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-2.html.ini
index 6772061abef..a0f69bb460b 100644
--- a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-2.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-2.html.ini
@@ -1,5 +1,6 @@
 [response-stream-disturbed-2.html]
   type: testharness
+  expected: ERROR
   [Getting blob after getting a locked Response body]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-3.html.ini b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-3.html.ini
index 0ecbe8fb87f..1fae2e402d2 100644
--- a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-3.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-3.html.ini
@@ -1,5 +1,6 @@
 [response-stream-disturbed-3.html]
   type: testharness
+  expected: ERROR
   [Getting blob after reading the Response body]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-4.html.ini b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-4.html.ini
index f8a0b5dd02f..2a663209676 100644
--- a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-4.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-4.html.ini
@@ -1,5 +1,6 @@
 [response-stream-disturbed-4.html]
   type: testharness
+  expected: ERROR
   [Getting blob after cancelling the Response body]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-5.html.ini b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-5.html.ini
index 7ef7a35a549..647919f227e 100644
--- a/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-5.html.ini
+++ b/tests/wpt/metadata/fetch/api/response/response-stream-disturbed-5.html.ini
@@ -1,5 +1,6 @@
 [response-stream-disturbed-5.html]
   type: testharness
+  expected: ERROR
   [Getting a body reader after consuming as blob]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/008.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/008.html.ini
index 9fbd1fc405a..a110968a8b5 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/008.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/008.html.ini
@@ -1,3 +1,3 @@
 [008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/joint_session_history/001.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/joint_session_history/001.html.ini
index 5656ec3a8ae..7ae291525bf 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/joint_session_history/001.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/joint_session_history/001.html.ini
@@ -1,6 +1,6 @@
 [001.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Session history length on initial load]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/joint_session_history/002.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/joint_session_history/002.html.ini
index 9dfb95ad692..5b47fc659d5 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/joint_session_history/002.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/joint_session_history/002.html.ini
@@ -1,6 +1,6 @@
 [002.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Session history length on initial load]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html.ini
index a7900cfcffb..79cd003bfbb 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/allow_prototype_cycle_through_location.sub.html.ini
@@ -1,6 +1,6 @@
 [allow_prototype_cycle_through_location.sub.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [same-origin, same-window location cycle]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_open_write.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_open_write.html.ini
index 3581149133b..895d2f2f282 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_open_write.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_open_write.html.ini
@@ -1,3 +1,3 @@
 [reload_document_open_write.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write.html.ini
index ac1b8e161f1..f1271ddf73e 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write.html.ini
@@ -1,3 +1,3 @@
 [reload_document_write.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write_onload.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write_onload.html.ini
index 6fcc25bc6fd..304a036f4d4 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write_onload.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_document_write_onload.html.ini
@@ -1,3 +1,3 @@
 [reload_document_write_onload.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_post_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_post_1.html.ini
index 2fe874f0d4e..673247284e4 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_post_1.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/reload_post_1.html.ini
@@ -1,3 +1,3 @@
 [reload_post_1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html.ini
index 91e07a6e800..e7844bf0924 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_assign_during_load.html.ini
@@ -1,6 +1,6 @@
 [scripted_click_assign_during_load.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Assignment to location with click during load]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html.ini
index 8f36b5dcbcf..e63972ce41e 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_click_location_assign_during_load.html.ini
@@ -1,6 +1,6 @@
 [scripted_click_location_assign_during_load.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [location.assign with click during load]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html.ini
index ff39780cf08..40a4ab9d7c6 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/scripted_form_submit_assign_during_load.html.ini
@@ -1,6 +1,6 @@
 [scripted_form_submit_assign_during_load.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Assignment to location with form submit during load]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects.sub.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects.sub.html.ini
index 0499a659c5c..e189163568f 100644
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects.sub.html.ini
@@ -1,3 +1,3 @@
 [cross-origin-objects.sub.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html.ini
index ce4d9304e98..83bd871d725 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_beforeunload.html.ini
@@ -1,6 +1,6 @@
 [close_beforeunload.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Running beforeunload handler in window.close()]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html.ini
index 930d7151043..935275388a6 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/close_unload.html.ini
@@ -1,6 +1,6 @@
 [close_unload.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Running unload handler in window.close()]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html.ini
index b6c81e5196b..882045d2623 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_1.html.ini
@@ -1,6 +1,6 @@
 [discard_iframe_history_1.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Removing iframe from document removes it from history]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html.ini
index 74e7c2f251a..864fe9a325f 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_2.html.ini
@@ -1,6 +1,6 @@
 [discard_iframe_history_2.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Removing iframe from document via innerHTML removes it from history]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html.ini
index 1f29c8de881..0d6e7127dab 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_3.html.ini
@@ -1,6 +1,6 @@
 [discard_iframe_history_3.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Removing iframe from document removes it from history]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html.ini
index f46ff721163..31ff6be6133 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/garbage-collection-and-browsing-contexts/discard_iframe_history_4.html.ini
@@ -1,6 +1,6 @@
 [discard_iframe_history_4.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Removing iframe from document removes it from history]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html.ini b/tests/wpt/metadata/html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html.ini
index c07030aeb15..ef3c2d48767 100644
--- a/tests/wpt/metadata/html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/browsing-context-names/browsing-context-choose-existing.html.ini
@@ -1,6 +1,6 @@
 [browsing-context-choose-existing.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The browsing context must be chosen if the given name is same as its name]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html.ini b/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html.ini
index fd1e429124c..fb4628a00e5 100644
--- a/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html.ini
+++ b/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/Document.currentScript.sub.html.ini
@@ -1,9 +1,6 @@
 [Document.currentScript.sub.html]
   type: testharness
   expected: TIMEOUT
-  [Script script-window-error]
-    expected: FAIL
-
   [Script script-svg]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index dd76d5dcadb..3ae6e829747 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -9002,3 +9002,4 @@
 
   [Event interface: calling initEvent(DOMString,boolean,boolean) on new TrackEvent("addtrack", {track:document.createElement("track").track}) with too few arguments must throw TypeError]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_008.htm.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_008.htm.ini
index 4fa459700a7..0e01160852a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_008.htm.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/video_008.htm.ini
@@ -1,6 +1,6 @@
 [video_008.htm]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [HTML5 Media Elements: 'media' attribute]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html.ini
index be4402dbca6..10e46d478e3 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_allow_script.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_allow_script.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [iframe_sandbox_allow_scripts]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html.ini
index e9672847d22..b7bccb267f9 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_01.html.ini
@@ -1,3 +1,3 @@
 [move_iframe_in_dom_01.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html.ini
index 03601194318..8a741a2d5fd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_02.html.ini
@@ -1,3 +1,3 @@
 [move_iframe_in_dom_02.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html.ini
index 13d7ef39130..8c607ee10fb 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/move_iframe_in_dom_04.html.ini
@@ -1,3 +1,3 @@
 [move_iframe_in_dom_04.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-checkValidity.html.ini b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-checkValidity.html.ini
index 73428d4850a..080328d4b58 100644
--- a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-checkValidity.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-checkValidity.html.ini
@@ -1,5 +1,6 @@
 [form-validation-checkValidity.html]
   type: testharness
+  expected: ERROR
   [[INPUT in TEXT status\] no constraint]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-reportValidity.html.ini b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-reportValidity.html.ini
index e476982e25e..f73f41718dd 100644
--- a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-reportValidity.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-reportValidity.html.ini
@@ -1,5 +1,6 @@
 [form-validation-reportValidity.html]
   type: testharness
+  expected: ERROR
   [[INPUT in TEXT status\] no constraint]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-customError.html.ini b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-customError.html.ini
index e3fef6c774d..e9618f1c032 100644
--- a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-customError.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-customError.html.ini
@@ -1,5 +1,6 @@
 [form-validation-validity-customError.html]
   type: testharness
+  expected: ERROR
   [[input\]  The validity.customError must be true if the custom validity error message is not empty]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-valid.html.ini b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-valid.html.ini
index 63b2c0816b3..39e9741de44 100644
--- a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-valid.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-valid.html.ini
@@ -1,5 +1,6 @@
 [form-validation-validity-valid.html]
   type: testharness
+  expected: ERROR
   [[INPUT in TEXT status\] validity.valid must be false if validity.tooLong is true]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-valueMissing.html.ini b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-valueMissing.html.ini
index f18a1d0dd25..1ffe2031536 100644
--- a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-valueMissing.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-validity-valueMissing.html.ini
@@ -1,5 +1,6 @@
 [form-validation-validity-valueMissing.html]
   type: testharness
+  expected: ERROR
   [[INPUT in TEXT status\] The required attribute is not set]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-willValidate.html.ini b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-willValidate.html.ini
index e6f2f9ce64b..13516e5ccde 100644
--- a/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-willValidate.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/constraints/form-validation-willValidate.html.ini
@@ -1,5 +1,6 @@
 [form-validation-willValidate.html]
   type: testharness
+  expected: ERROR
   [[INPUT in HIDDEN status\] Must be barred from the constraint validation]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/animation-frames/callback-exception.html.ini b/tests/wpt/metadata/html/webappapis/animation-frames/callback-exception.html.ini
deleted file mode 100644
index 43ac27f20e2..00000000000
--- a/tests/wpt/metadata/html/webappapis/animation-frames/callback-exception.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[callback-exception.html]
-  type: testharness
-  expected: TIMEOUT
-  bug: https://github.com/servo/servo/issues/3311
-  [requestAnimationFrame callback exceptions are reported to error handler]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/addEventListener.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/addEventListener.html.ini
new file mode 100644
index 00000000000..266639e92b7
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/addEventListener.html.ini
@@ -0,0 +1,5 @@
+[addEventListener.html]
+  type: testharness
+  [window.onerror - addEventListener]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-compile-error-data-url.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-compile-error-data-url.html.ini
deleted file mode 100644
index 1a3156ca26b..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-compile-error-data-url.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[body-onerror-compile-error-data-url.html]
-  type: testharness
-  [<]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-compile-error.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-compile-error.html.ini
deleted file mode 100644
index c009f751560..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-compile-error.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[body-onerror-compile-error.html]
-  type: testharness
-  [<]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-runtime-error.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-runtime-error.html.ini
deleted file mode 100644
index 0e6f04a7f42..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/body-onerror-runtime-error.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[body-onerror-runtime-error.html]
-  type: testharness
-  [<]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-data-url.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-data-url.html.ini
deleted file mode 100644
index ad87012754f..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-data-url.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[compile-error-data-url.html]
-  type: testharness
-  [window.onerror - compile error in ]
-    expected: FAIL
-
-  [window.onerror - compile error in <script src=data:...> (column)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html.ini
index 0e052aa4acf..752af74198b 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-in-setInterval.html.ini
@@ -3,6 +3,3 @@
   [window.onerror - compile error in setInterval]
     expected: FAIL
 
-  [window.onerror - compile error in setInterval (column)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html.ini
index 0b28074c4e3..d3d5cda8bdf 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-in-setTimeout.html.ini
@@ -3,6 +3,3 @@
   [window.onerror - compile error in setTimeout]
     expected: FAIL
 
-  [window.onerror - compile error in setTimeout (column)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-same-origin.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-same-origin.html.ini
deleted file mode 100644
index 3ccad9ec268..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error-same-origin.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[compile-error-same-origin.html]
-  type: testharness
-  [window.onerror - compile error in ]
-    expected: FAIL
-
-  [window.onerror - compile error in <script src=...> (column)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error.html.ini
deleted file mode 100644
index 7bc1f56d37d..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/compile-error.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[compile-error.html]
-  type: testharness
-  [window.onerror - compile error in ]
-    expected: FAIL
-
-  [window.onerror - compile error in <script> (column)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-data-url.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-data-url.html.ini
deleted file mode 100644
index 95940ded145..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-data-url.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[runtime-error-data-url.html]
-  type: testharness
-  [window.onerror - runtime error in ]
-    expected: FAIL
-
-  [window.onerror - runtime error in <script src=data:...> (column)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-attribute.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-attribute.html.ini
deleted file mode 100644
index 6ba6acdf864..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-attribute.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[runtime-error-in-attribute.html]
-  type: testharness
-  [window.onerror - runtime error in attribute]
-    expected: FAIL
-
-  [window.onerror - runtime error in attribute (column)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-body-onerror.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-body-onerror.html.ini
deleted file mode 100644
index e4231127761..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-body-onerror.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[runtime-error-in-body-onerror.html]
-  type: testharness
-  [runtime error in ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html.ini
index 9f4aef723f1..87185237f1f 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-setInterval.html.ini
@@ -3,6 +3,3 @@
   [window.onerror - runtime error in setInterval]
     expected: FAIL
 
-  [window.onerror - runtime error in setInterval (column)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html.ini
index 4ca3ceff69d..e26437f73a1 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-setTimeout.html.ini
@@ -3,6 +3,3 @@
   [window.onerror - runtime error in setTimeout]
     expected: FAIL
 
-  [window.onerror - runtime error in setTimeout (column)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html.ini
deleted file mode 100644
index fcf5f93037f..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-in-window-onerror.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[runtime-error-in-window-onerror.html]
-  type: testharness
-  [runtime error in window.onerror]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html.ini
deleted file mode 100644
index 5417b2fdbd3..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error-same-origin.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[runtime-error-same-origin.html]
-  type: testharness
-  [window.onerror - runtime error in ]
-    expected: FAIL
-
-  [window.onerror - runtime error in <script src=...> (column)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error.html.ini
deleted file mode 100644
index 50f4b25ec31..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/runtime-error.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[runtime-error.html]
-  type: testharness
-  [window.onerror - runtime error in ]
-    expected: FAIL
-
-  [window.onerror - runtime error in <script> (column)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html.ini
index fcc0149a495..7a06f9dc035 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-parse-error.html.ini
@@ -1,5 +1,5 @@
 [window-onerror-parse-error.html]
   type: testharness
-  [correct number of calls to window.onerror]
+  [correct line number passed to window.onerror]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html.ini
deleted file mode 100644
index 5b87401947d..00000000000
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error-throw.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[window-onerror-runtime-error-throw.html]
-  type: testharness
-  [correct number of calls to window.onerror]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html.ini
index c3a4afc193b..eae9e05c0bf 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/window-onerror-runtime-error.html.ini
@@ -1,5 +1,5 @@
 [window-onerror-runtime-error.html]
   type: testharness
-  [correct number of calls to window.onerror]
+  [correct line number passed to window.onerror]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/timers/evil-spec-example.html.ini b/tests/wpt/metadata/html/webappapis/timers/evil-spec-example.html.ini
index f072ddaee12..2734d126b62 100644
--- a/tests/wpt/metadata/html/webappapis/timers/evil-spec-example.html.ini
+++ b/tests/wpt/metadata/html/webappapis/timers/evil-spec-example.html.ini
@@ -1,6 +1,6 @@
 [evil-spec-example.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Interaction of setTimeout and WebIDL]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/navigation-timing/test_document_open.html.ini b/tests/wpt/metadata/navigation-timing/test_document_open.html.ini
index d59307e0ac7..81027037b49 100644
--- a/tests/wpt/metadata/navigation-timing/test_document_open.html.ini
+++ b/tests/wpt/metadata/navigation-timing/test_document_open.html.ini
@@ -1,3 +1,3 @@
 [test_document_open.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/navigation-timing/test_navigation_redirectCount_none.html.ini b/tests/wpt/metadata/navigation-timing/test_navigation_redirectCount_none.html.ini
index 57ff6920754..34f56001ffc 100644
--- a/tests/wpt/metadata/navigation-timing/test_navigation_redirectCount_none.html.ini
+++ b/tests/wpt/metadata/navigation-timing/test_navigation_redirectCount_none.html.ini
@@ -1,5 +1,6 @@
 [test_navigation_redirectCount_none.html]
   type: testharness
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/navigation-timing/test_navigation_type_backforward.html.ini b/tests/wpt/metadata/navigation-timing/test_navigation_type_backforward.html.ini
index aa92e29a101..98fd693372b 100644
--- a/tests/wpt/metadata/navigation-timing/test_navigation_type_backforward.html.ini
+++ b/tests/wpt/metadata/navigation-timing/test_navigation_type_backforward.html.ini
@@ -1,6 +1,6 @@
 [test_navigation_type_backforward.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/navigation-timing/test_navigation_type_reload.html.ini b/tests/wpt/metadata/navigation-timing/test_navigation_type_reload.html.ini
index 2c31efb1f7f..6d68b802797 100644
--- a/tests/wpt/metadata/navigation-timing/test_navigation_type_reload.html.ini
+++ b/tests/wpt/metadata/navigation-timing/test_navigation_type_reload.html.ini
@@ -1,6 +1,6 @@
 [test_navigation_type_reload.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/navigation-timing/test_no_previous_document.html.ini b/tests/wpt/metadata/navigation-timing/test_no_previous_document.html.ini
index c2521d7415d..765ffb343c3 100644
--- a/tests/wpt/metadata/navigation-timing/test_no_previous_document.html.ini
+++ b/tests/wpt/metadata/navigation-timing/test_no_previous_document.html.ini
@@ -1,6 +1,6 @@
 [test_no_previous_document.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/navigation-timing/test_timing_attributes_order.html.ini b/tests/wpt/metadata/navigation-timing/test_timing_attributes_order.html.ini
index 933721b6c2d..b4ee9f70984 100644
--- a/tests/wpt/metadata/navigation-timing/test_timing_attributes_order.html.ini
+++ b/tests/wpt/metadata/navigation-timing/test_timing_attributes_order.html.ini
@@ -1,6 +1,6 @@
 [test_timing_attributes_order.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/navigation-timing/test_timing_reload.html.ini b/tests/wpt/metadata/navigation-timing/test_timing_reload.html.ini
index fba8c5bfd7c..608445d0a20 100644
--- a/tests/wpt/metadata/navigation-timing/test_timing_reload.html.ini
+++ b/tests/wpt/metadata/navigation-timing/test_timing_reload.html.ini
@@ -1,6 +1,6 @@
 [test_timing_reload.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/navigation-timing/test_timing_server_redirect.html.ini b/tests/wpt/metadata/navigation-timing/test_timing_server_redirect.html.ini
index cda80629d89..e28454ea16e 100644
--- a/tests/wpt/metadata/navigation-timing/test_timing_server_redirect.html.ini
+++ b/tests/wpt/metadata/navigation-timing/test_timing_server_redirect.html.ini
@@ -1,5 +1,6 @@
 [test_timing_server_redirect.html]
   type: testharness
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/navigation-timing/test_timing_xserver_redirect.html.ini b/tests/wpt/metadata/navigation-timing/test_timing_xserver_redirect.html.ini
index 1ced1993a12..2c689295522 100644
--- a/tests/wpt/metadata/navigation-timing/test_timing_xserver_redirect.html.ini
+++ b/tests/wpt/metadata/navigation-timing/test_timing_xserver_redirect.html.ini
@@ -1,6 +1,6 @@
 [test_timing_xserver_redirect.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [window.performance.navigation is defined]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/navigation-timing/test_unique_performance_objects.html.ini b/tests/wpt/metadata/navigation-timing/test_unique_performance_objects.html.ini
new file mode 100644
index 00000000000..42a39a1d795
--- /dev/null
+++ b/tests/wpt/metadata/navigation-timing/test_unique_performance_objects.html.ini
@@ -0,0 +1,3 @@
+[test_unique_performance_objects.html]
+  type: testharness
+  expected: ERROR
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/005.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/005.html.ini
index 8b1d1c690e0..243d227c11d 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/005.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/005.html.ini
@@ -1,5 +1,6 @@
 [005.html]
   type: testharness
+  expected: ERROR
   [ scheduler: document.write inline in markup ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/006.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/006.html.ini
index 54af1212e5f..2642734fc07 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/006.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/006.html.ini
@@ -1,5 +1,6 @@
 [006.html]
   type: testharness
+  expected: ERROR
   [ scheduler: document.write inline - multiple]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/007.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/007.html.ini
index 7351254d579..22f2d7a6903 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/007.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/007.html.ini
@@ -1,5 +1,6 @@
 [007.html]
   type: testharness
+  expected: ERROR
   [ scheduler: document.write external]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/008.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/008.html.ini
index f88a254e8ff..af39e4fa9b4 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/008.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/008.html.ini
@@ -1,5 +1,6 @@
 [008.html]
   type: testharness
+  expected: ERROR
   [ scheduler: document.write external - multiple]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/009.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/009.html.ini
index 36a6b79c88f..5874e98437e 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/009.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/009.html.ini
@@ -1,5 +1,6 @@
 [009.html]
   type: testharness
+  expected: ERROR
   [ scheduler: document.write external - multiple with doc.write]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/010.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/010.html.ini
index 20732c52903..98c79183ff7 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/010.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/010.html.ini
@@ -1,5 +1,6 @@
 [010.html]
   type: testharness
+  expected: ERROR
   [ scheduler: document.write external + inline - multiple with doc.write]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/011.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/011.html.ini
index 91ae46d456f..103f7f7049f 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/011.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/011.html.ini
@@ -1,5 +1,6 @@
 [011.html]
   type: testharness
+  expected: ERROR
   [ scheduler: document.write external + inline - multiple with doc.write + subsequent markup]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/012.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/012.html.ini
index 97e1a8c2e66..65c422e769c 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/012.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/012.html.ini
@@ -1,5 +1,6 @@
 [012.html]
   type: testharness
+  expected: ERROR
   [ scheduler: document.write external and onload events ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/018.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/018.html.ini
index 51779a58e20..271ef2039a9 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/018.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/018.html.ini
@@ -1,5 +1,6 @@
 [018.html]
   type: testharness
+  expected: ERROR
   [ scheduler: DOM added scripts and doc.write]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/026.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/026.html.ini
index 3d19bbb0ffd..b3c115ac7dd 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/026.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/026.html.ini
@@ -1,5 +1,6 @@
 [026.html]
   type: testharness
+  expected: ERROR
   [ scheduler: doc write added script, .src set later]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/027.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/027.html.ini
index 754f603ba37..ab940259b5f 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/027.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/027.html.ini
@@ -1,5 +1,6 @@
 [027.html]
   type: testharness
+  expected: ERROR
   [ scheduler: doc write added script with content, .src set later]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/028.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/028.html.ini
index 52f13d00053..27d41fdb5e2 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/028.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/028.html.ini
@@ -1,5 +1,6 @@
 [028.html]
   type: testharness
+  expected: ERROR
   [ scheduler: javascript: URL]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/041.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/041.html.ini
index 1aa57a18d9c..4674fe1278a 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/041.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/041.html.ini
@@ -1,5 +1,6 @@
 [041.html]
   type: testharness
+  expected: ERROR
   [ scheduler: document.write scripts that write scripts]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/068.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/068.html.ini
index 9cb8f043f41..f46a8284872 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/068.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/068.html.ini
@@ -1,3 +1,3 @@
 [068.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/070.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/070.html.ini
index 34774a78439..a92c4cea048 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/070.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/070.html.ini
@@ -1,3 +1,3 @@
 [070.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/071.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/071.html.ini
index 225469776b1..119c30eda82 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/071.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/071.html.ini
@@ -1,3 +1,3 @@
 [071.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/072.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/072.html.ini
index 5ad9d625a46..abaaec0fe59 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/072.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/072.html.ini
@@ -1,3 +1,3 @@
 [072.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/073.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/073.html.ini
index 537e3e7c333..6b366aa1ebb 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/073.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/073.html.ini
@@ -1,3 +1,3 @@
 [073.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/074.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/074.html.ini
index a894f1b162c..4aab3101a19 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/074.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/074.html.ini
@@ -1,3 +1,3 @@
 [074.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/075.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/075.html.ini
index bafaab9102f..5f4a885905e 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/075.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/075.html.ini
@@ -1,5 +1,6 @@
 [075.html]
   type: testharness
+  expected: ERROR
   [dispatchEvent from child frame during document.write :-o ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/077.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/077.html.ini
index 71077979c71..b0dc9cdab83 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/077.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/077.html.ini
@@ -1,5 +1,6 @@
 [077.html]
   type: testharness
+  expected: ERROR
   [ adding several types of scripts through the DOM and removing some of them confuses scheduler ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/083.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/083.html.ini
index 9272fa0716d..242251f7104 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/083.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/083.html.ini
@@ -1,5 +1,6 @@
 [083.html]
   type: testharness
+  expected: ERROR
   [ scheduler: event listener defined by script in a document in history]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/084.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/084.html.ini
index 6268eb738fb..d602b485be6 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/084.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/084.html.ini
@@ -1,5 +1,6 @@
 [084.html]
   type: testharness
+  expected: ERROR
   [ scheduler: event listener defined by script in a removed IFRAME]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/096.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/096.html.ini
index 7647c26e9f9..4fce6512336 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/096.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/096.html.ini
@@ -1,5 +1,6 @@
 [096.html]
   type: testharness
+  expected: ERROR
   [ scheduler: defer script added from document.write relative to DOMContentLoaded]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/097.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/097.html.ini
index 8bf7322803a..da923dd340e 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/097.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/097.html.ini
@@ -1,5 +1,6 @@
 [097.html]
   type: testharness
+  expected: ERROR
   [ scheduler: slow-loading async script added from document.write]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/098.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/098.html.ini
index 5b0aa1e5e0c..2c835f074c4 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/098.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/098.html.ini
@@ -1,5 +1,6 @@
 [098.html]
   type: testharness
+  expected: ERROR
   [ scheduler: defer script added from document.write]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/120.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/120.html.ini
index 522ce72d541..6a0f1c628e5 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/120.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/120.html.ini
@@ -1,6 +1,6 @@
 [120.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [scheduler: script created without a window ]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/149.html.ini b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/149.html.ini
index 54f6bbc3ffc..2eb68a6f0fe 100644
--- a/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/149.html.ini
+++ b/tests/wpt/metadata/old-tests/submission/Opera/script_scheduling/149.html.ini
@@ -1,5 +1,6 @@
 [149.html]
   type: testharness
+  expected: ERROR
   [for='window' event='onload()' parser inserted executes immediately]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 91ee7012d1c..4a998312a6e 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
index c54c8b918ae..3e0251ca6b3 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index a940c8261c9..892b0d7426f 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/img-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index 5b8fbf590ba..af367067094 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
index 32130dbd677..b74aae72163 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index 72f2cfd5b69..b7647327d71 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index 5a28dbcbca3..fa11c4ff85c 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
index 72b7d56e183..0307c4de687 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index 85dd8552d2d..53fc963df75 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/img-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
index 89858f3ede4..ab287102dac 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
index c5de377ed72..3fbcd789be5 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
index 622c2d805bc..4bba5d3a743 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index a68da6c264f..d234dcdfaed 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index f5db940ea86..681176b91aa 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index 78b4bc3f06d..f7a1343821b 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index 7fdd8c6335e..8a8e025f440 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index 69ff4623270..1b112194127 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index 8015899b6cb..8f3f85788a2 100644
--- a/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/no-referrer/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
index 655cb1ee90e..be40d81af5d 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
index 5f9cc2bcf2e..c239896dfea 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
index 0313884ee2e..ad3d4cbb5fd 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
index df24bea90b9..81fad2862a4 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
index 6debe924859..138ff6515ba 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
index c8b85815027..37d0d20a24c 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
index 5503d09dee2..3ef8c5aa869 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.ini
index 9c776acb616..97c67196239 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
index 79e94a60bab..a73fb2e041d 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 9c38e935d05..91fd5b6d9a2 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
index 73389344c3f..2c475aeb619 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.ini
index dee975f05af..cb23dc45d6e 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
index bfc18a77a83..ac3d5e6b471 100644
--- a/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/img-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
index 0f7cdaf768c..0e5c391bbe3 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
index f78eb3f8f8d..bd90352656b 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
index d2a3409c1b3..315925b6752 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index 79d6d973d2b..9ce69d6422e 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index 31f18a5a14f..d88225fef83 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index e316e7e1768..1b19a8580da 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index e49bdf3eb3b..790e8a47ea1 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index 986402e36d8..6b0bb9720b0 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index a841aa138a9..e73c7d7752b 100644
--- a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
index b5088a88be5..efd19b8c1cf 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
index 27e73eb1503..8437a5d2b91 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
index b7d4a2d691a..097e88958f3 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index 35a5cb4215c..f4e044a4beb 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index fedd0366b66..ee0130983c4 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index 65004a14284..4fca1d9b75c 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index 6a60ff191e7..afe80c074b4 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index 0cc76099d78..f485c7324bb 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index 932db7948f9..e78c9ca2355 100644
--- a/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
index 49ba7c28958..1c76f799ff8 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
index 4c3aeb87925..ee0581e963a 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
index 3bedfecd4d1..51471c7231c 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index c243ff5fcb6..e36900a6a40 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index 1a1e4b306dc..93bece42fc8 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index 267569d556b..443f99f3c77 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-csp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index e0a2950fa56..11030dafe43 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index 8da3355b49f..bddeb2d4599 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index 0c78b0c7091..3eb69ad7fd7 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-csp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-csp\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/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
index 27ff2f7cd9b..b3cd087472b 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
index a7604f56fe6..19d4fd94686 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
index ae39df234a8..5b5b4664aba 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index c508507ecfc..3316d156e67 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index ca3affe958b..82a8cf68662 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index 4b11ac13d4f..85a4f794f05 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index 73d5b17105a..5f5e4949be3 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index cb09ec807ab..9fd3d0652e1 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index 8a617497535..7c5ab691d17 100644
--- a/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/origin/meta-referrer/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
index 094e3bcd8f0..1c90a3edb25 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
index e26d179f5ba..33d0da8f622 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
index fb487a45263..cfc29145faa 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
index a0c828b8656..17c27c6cf4d 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
index 2f0170676e0..3fc8be421d8 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
index b52cfe0281c..dee647d4471 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 870d6506311..a542a879f82 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
index f4069850945..be51f00ab15 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
index a3a597ea684..6fcf3977d1d 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
index 01bfa1039b1..a6b0c21934f 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
index e6d172ca0fd..997a0044a6b 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
index b08374d9004..22a6007de2b 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
index 3a79def8a7e..205e271b9dd 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 65be6fa58bf..86f39b9156e 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/http-rp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
index 2d861cf1409..9c930749dba 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-csp\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-csp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
index 22ab0a5f89e..be38bf3b941 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-csp\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-csp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
index ea72b756900..4d5a4413286 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-csp\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-csp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
index 364c11399d7..bffb9962509 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-csp\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-csp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
index d084b7a0986..e2d84432901 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-csp\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-csp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
index 2e6e9dab767..46f8b4b9fc8 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-csp\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-csp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 764348ac110..7a20c0bfdc2 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-csp/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-csp\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/img-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
index ca170971f73..4a5e85c79d2 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
index ccb9af6a0eb..32e52909213 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
index 8b677eb05ce..c40a2304116 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
index 90293daea17..ef75fac925a 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
index af4c83feaff..0e0957bfe63 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
index 4fc1c98e349..cf952e4eb01 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/img-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 37ab3a67a8a..645226ef268 100644
--- a/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/same-origin/meta-referrer/same-origin/http-https/img-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
index 9fb8bb299ef..b2f8fce08e6 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
index 37ac1c5e746..f9422e95893 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
index 874a274f24e..eadec3eb8ac 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index d06b42a2a1f..fa0c01327e5 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index 9ebd88e4283..31f49ec6d37 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index f041ba0b343..a266a158576 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
index 93ffccf1866..1b506477a69 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
index 9367ce79a93..f561b810665 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
index 2a428753108..b8aca5feb72 100644
--- a/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/metadata/referrer-policy/unsafe-url/http-rp/same-origin/http-https/img-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via img-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html.ini
index b7d80660daa..93580149f5f 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertex-attrib-zero-issues.html.ini
@@ -1,5 +1,6 @@
 [gl-vertex-attrib-zero-issues.html]
   type: testharness
+  expected: ERROR
   [WebGL test #3: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertexattribpointer-offsets.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertexattribpointer-offsets.html.ini
index 840b43bb710..cb4ecfaa714 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertexattribpointer-offsets.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/attribs/gl-vertexattribpointer-offsets.html.ini
@@ -1,5 +1,6 @@
 [gl-vertexattribpointer-offsets.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/buffer-data-array-buffer-delete.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/buffer-data-array-buffer-delete.html.ini
index 528a5edb972..a6a2d5407ce 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/buffer-data-array-buffer-delete.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/buffer-data-array-buffer-delete.html.ini
@@ -1,5 +1,6 @@
 [buffer-data-array-buffer-delete.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/buffer-data-array-buffer.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/buffer-data-array-buffer.html.ini
index 487ad41bcac..237584e7c2f 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/buffer-data-array-buffer.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/buffer-data-array-buffer.html.ini
@@ -1,5 +1,6 @@
 [buffer-data-array-buffer.html]
   type: testharness
+  expected: ERROR
   [WebGL test #3: getError expected: INVALID_OPERATION. Was INVALID_VALUE : ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/index-validation-crash-with-buffer-sub-data.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/index-validation-crash-with-buffer-sub-data.html.ini
index 5b0bb6fad08..78edea0b719 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/index-validation-crash-with-buffer-sub-data.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/index-validation-crash-with-buffer-sub-data.html.ini
@@ -1,5 +1,6 @@
 [index-validation-crash-with-buffer-sub-data.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/index-validation.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/index-validation.html.ini
index b22addef8e6..6b265933f0c 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/index-validation.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/buffers/index-validation.html.ini
@@ -1,5 +1,6 @@
 [index-validation.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: gl.checkFramebufferStatus(gl.FRAMEBUFFER) should be 36053. Threw exception TypeError: gl.checkFramebufferStatus is not a function]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/invalid-passed-params.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/invalid-passed-params.html.ini
index 8e73effb353..7902ca6a6eb 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/invalid-passed-params.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/invalid-passed-params.html.ini
@@ -122,3 +122,4 @@
 
   [WebGL test #72: context.getError() should be 1281. Was 0.]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini
index 0d889b67a86..3232baffd25 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/object-deletion-behaviour.html.ini
@@ -2,6 +2,7 @@
   type: testharness
   expected:
     if os == "linux": TIMEOUT
+    if not debug and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64) and (backend == "cpu"): ERROR
   [WebGL test #9: gl.isShader(vertexShader) should be true. Threw exception TypeError: gl.isShader is not a function]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/shader-precision-format.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/shader-precision-format.html.ini
index 085fb506caf..1de68eb69bb 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/shader-precision-format.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/shader-precision-format.html.ini
@@ -1,5 +1,6 @@
 [shader-precision-format.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: gl.getShaderPrecisionFormat(gl.VERTEX_SHADER, gl.LOW_FLOAT) instanceof WebGLShaderPrecisionFormat should be true. Threw exception TypeError: gl.getShaderPrecisionFormat is not a function]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/uninitialized-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/uninitialized-test.html.ini
index 7725a25d42b..a6a8447f2dc 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/uninitialized-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/misc/uninitialized-test.html.ini
@@ -1,5 +1,6 @@
 [uninitialized-test.html]
   type: testharness
+  expected: ERROR
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/abs/abs_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/abs/abs_001_to_006.html.ini
index 174ef1b801f..6ec567fad17 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/abs/abs_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/abs/abs_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [abs_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini
index 853f39427d9..4193d839325 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [acos_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/all/all_001_to_004.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/all/all_001_to_004.html.ini
index a5a93400402..bb414b5083d 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/all/all_001_to_004.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/all/all_001_to_004.html.ini
@@ -1,3 +1,3 @@
 [all_001_to_004.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/any/any_001_to_004.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/any/any_001_to_004.html.ini
index 05069c0bc81..fabebb85a8a 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/any/any_001_to_004.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/any/any_001_to_004.html.ini
@@ -1,3 +1,3 @@
 [any_001_to_004.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/array/array_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/array/array_001_to_006.html.ini
index b1e376397e7..4ae8ca1fe94 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/array/array_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/array/array_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [array_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini
index 9dec8f7f59d..015ae0d8baf 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [asin_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_001_to_008.html.ini
index 2cb97b72f88..4872ca3bd6e 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [atan_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_009_to_012.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_009_to_012.html.ini
index b138fa04967..d06d014989f 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_009_to_012.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_009_to_012.html.ini
@@ -1,3 +1,3 @@
 [atan_009_to_012.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biConstants/biConstants_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biConstants/biConstants_001_to_008.html.ini
index dbd3febb05d..dbf71da9985 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biConstants/biConstants_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biConstants/biConstants_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [biConstants_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biConstants/biConstants_009_to_016.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biConstants/biConstants_009_to_016.html.ini
index 8d0a1a68598..83155f66bb1 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biConstants/biConstants_009_to_016.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biConstants/biConstants_009_to_016.html.ini
@@ -1,3 +1,3 @@
 [biConstants_009_to_016.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biuDepthRange/biuDepthRange_001_to_002.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biuDepthRange/biuDepthRange_001_to_002.html.ini
index 60f8f028d7e..2d2d477c6b2 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biuDepthRange/biuDepthRange_001_to_002.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/biuDepthRange/biuDepthRange_001_to_002.html.ini
@@ -1,3 +1,3 @@
 [biuDepthRange_001_to_002.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/ceil/ceil_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/ceil/ceil_001_to_006.html.ini
index 774d433d8dd..7acc0fe2069 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/ceil/ceil_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/ceil/ceil_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [ceil_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/clamp/clamp_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/clamp/clamp_001_to_006.html.ini
index c4d2fdd94b6..d0210b72946 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/clamp/clamp_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/clamp/clamp_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [clamp_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/control_flow/control_flow_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/control_flow/control_flow_001_to_008.html.ini
index c08051c4d6f..58af3d328d8 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/control_flow/control_flow_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/control_flow/control_flow_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [control_flow_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/control_flow/control_flow_009_to_010.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/control_flow/control_flow_009_to_010.html.ini
index 8933e530393..d1d0c4b7874 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/control_flow/control_flow_009_to_010.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/control_flow/control_flow_009_to_010.html.ini
@@ -1,3 +1,3 @@
 [control_flow_009_to_010.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/cos/cos_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/cos/cos_001_to_006.html.ini
index eae5d22fe96..25f281542bc 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/cos/cos_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/cos/cos_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [cos_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/cross/cross_001_to_002.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/cross/cross_001_to_002.html.ini
index 7e84d2a079d..f8e50598cab 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/cross/cross_001_to_002.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/cross/cross_001_to_002.html.ini
@@ -1,3 +1,3 @@
 [cross_001_to_002.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/default/default_001_to_001.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/default/default_001_to_001.html.ini
index 17a3363f2bd..72bcc4264e1 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/default/default_001_to_001.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/default/default_001_to_001.html.ini
@@ -1,3 +1,3 @@
 [default_001_to_001.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/degrees/degrees_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/degrees/degrees_001_to_006.html.ini
index 6e41c925a1b..f2d8fcbac17 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/degrees/degrees_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/degrees/degrees_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [degrees_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/discard/discard_001_to_002.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/discard/discard_001_to_002.html.ini
index 7cb99a8d326..5fe9bf6bd3c 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/discard/discard_001_to_002.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/discard/discard_001_to_002.html.ini
@@ -1,3 +1,3 @@
 [discard_001_to_002.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/distance/distance_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/distance/distance_001_to_006.html.ini
index e58c321799b..cce2cd33061 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/distance/distance_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/distance/distance_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [distance_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/dot/dot_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/dot/dot_001_to_006.html.ini
index 8a02c078a82..b46d27d4bb1 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/dot/dot_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/dot/dot_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [dot_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/equal/equal_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/equal/equal_001_to_008.html.ini
index b6c9c9b9f24..33eb2f362aa 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/equal/equal_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/equal/equal_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [equal_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/equal/equal_009_to_012.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/equal/equal_009_to_012.html.ini
index 5d7efa5bd61..bd552ed71a6 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/equal/equal_009_to_012.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/equal/equal_009_to_012.html.ini
@@ -1,3 +1,3 @@
 [equal_009_to_012.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp/exp_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp/exp_001_to_008.html.ini
index aa399b747ed..7bc5b3d81ad 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp/exp_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp/exp_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [exp_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp/exp_009_to_012.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp/exp_009_to_012.html.ini
index 69b0a775f2e..6297018752b 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp/exp_009_to_012.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp/exp_009_to_012.html.ini
@@ -1,3 +1,3 @@
 [exp_009_to_012.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp2/exp2_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp2/exp2_001_to_008.html.ini
index 3993c908f4d..abb004fe6c8 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp2/exp2_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp2/exp2_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [exp2_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp2/exp2_009_to_012.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp2/exp2_009_to_012.html.ini
index cb0f6230091..6890e257515 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp2/exp2_009_to_012.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/exp2/exp2_009_to_012.html.ini
@@ -1,3 +1,3 @@
 [exp2_009_to_012.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/faceforward/faceforward_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/faceforward/faceforward_001_to_006.html.ini
index a8d18230173..0477bf2abb9 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/faceforward/faceforward_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/faceforward/faceforward_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [faceforward_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/floor/floor_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/floor/floor_001_to_006.html.ini
index ebee7656016..c7ff1b2d3d8 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/floor/floor_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/floor/floor_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [floor_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/fract/fract_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/fract/fract_001_to_006.html.ini
index c387d4a5432..fda14c46e60 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/fract/fract_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/fract/fract_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [fract_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/gl_FragCoord/gl_FragCoord_001_to_003.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/gl_FragCoord/gl_FragCoord_001_to_003.html.ini
index 1af1d56bf11..b4e7c42114f 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/gl_FragCoord/gl_FragCoord_001_to_003.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/gl_FragCoord/gl_FragCoord_001_to_003.html.ini
@@ -1,3 +1,3 @@
 [gl_FragCoord_001_to_003.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/gl_FrontFacing/gl_FrontFacing_001_to_001.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/gl_FrontFacing/gl_FrontFacing_001_to_001.html.ini
index 1520df90d6a..b79784cdcd9 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/gl_FrontFacing/gl_FrontFacing_001_to_001.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/gl_FrontFacing/gl_FrontFacing_001_to_001.html.ini
@@ -1,3 +1,3 @@
 [gl_FrontFacing_001_to_001.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/greaterThan/greaterThan_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/greaterThan/greaterThan_001_to_008.html.ini
index 373ff45da2a..f2775dc58da 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/greaterThan/greaterThan_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/greaterThan/greaterThan_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [greaterThan_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/greaterThanEqual/greaterThanEqual_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/greaterThanEqual/greaterThanEqual_001_to_008.html.ini
index f31b9068b5f..82a3dd61ca6 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/greaterThanEqual/greaterThanEqual_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/greaterThanEqual/greaterThanEqual_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [greaterThanEqual_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/inversesqrt/inversesqrt_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/inversesqrt/inversesqrt_001_to_006.html.ini
index 5fbd861e030..92dfe5ddbd2 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/inversesqrt/inversesqrt_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/inversesqrt/inversesqrt_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [inversesqrt_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/length/length_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/length/length_001_to_006.html.ini
index b1743382927..47cd2723f34 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/length/length_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/length/length_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [length_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/lessThan/lessThan_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/lessThan/lessThan_001_to_008.html.ini
index 9ba031fe6f3..10ae9229a75 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/lessThan/lessThan_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/lessThan/lessThan_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [lessThan_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/lessThanEqual/lessThanEqual_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/lessThanEqual/lessThanEqual_001_to_008.html.ini
index c895894986c..06ad4bc6eaf 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/lessThanEqual/lessThanEqual_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/lessThanEqual/lessThanEqual_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [lessThanEqual_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini
index a172b374dab..ffc92ff636e 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [log_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_009_to_012.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_009_to_012.html.ini
index ffff27be6ca..81a4d6d6020 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_009_to_012.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_009_to_012.html.ini
@@ -1,3 +1,3 @@
 [log_009_to_012.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini
index c6b6b62db70..822b2adc005 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [log2_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_009_to_012.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_009_to_012.html.ini
index 7e1f626d4d9..8c9bb896fcf 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_009_to_012.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_009_to_012.html.ini
@@ -1,3 +1,3 @@
 [log2_009_to_012.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_001_to_008.html.ini
index c539213ab61..16df23c80cb 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [mat_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_009_to_016.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_009_to_016.html.ini
index 16e59255df0..2bc45ca7734 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_009_to_016.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_009_to_016.html.ini
@@ -1,3 +1,3 @@
 [mat_009_to_016.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_017_to_024.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_017_to_024.html.ini
index d5ad260ca31..977308e0951 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_017_to_024.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_017_to_024.html.ini
@@ -1,3 +1,3 @@
 [mat_017_to_024.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_025_to_032.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_025_to_032.html.ini
index 2fa836d82aa..33e429af15e 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_025_to_032.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_025_to_032.html.ini
@@ -1,3 +1,3 @@
 [mat_025_to_032.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_033_to_040.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_033_to_040.html.ini
index 5f6754da21b..7c65edd1f33 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_033_to_040.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_033_to_040.html.ini
@@ -1,3 +1,3 @@
 [mat_033_to_040.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_041_to_046.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_041_to_046.html.ini
index f95378fb331..7eb90ca359d 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_041_to_046.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat/mat_041_to_046.html.ini
@@ -1,3 +1,3 @@
 [mat_041_to_046.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat3/mat3_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat3/mat3_001_to_006.html.ini
index e209cca7627..220d39d3bf7 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat3/mat3_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mat3/mat3_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [mat3_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/matrixCompMult/matrixCompMult_001_to_004.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/matrixCompMult/matrixCompMult_001_to_004.html.ini
index aa7a6af20c2..64939006931 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/matrixCompMult/matrixCompMult_001_to_004.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/matrixCompMult/matrixCompMult_001_to_004.html.ini
@@ -1,3 +1,3 @@
 [matrixCompMult_001_to_004.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/max/max_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/max/max_001_to_006.html.ini
index 4bb6ebb224a..c9ab3c49990 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/max/max_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/max/max_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [max_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/min/min_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/min/min_001_to_006.html.ini
index d74e031cd17..e3034169bdc 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/min/min_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/min/min_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [min_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mix/mix_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mix/mix_001_to_006.html.ini
index a6d4c2dfb14..b6a5375889a 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mix/mix_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mix/mix_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [mix_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mod/mod_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mod/mod_001_to_008.html.ini
index fe0c910067b..b94d4138a52 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mod/mod_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/mod/mod_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [mod_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/normalize/normalize_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/normalize/normalize_001_to_006.html.ini
index e0d77bdaf6f..5968bf2c8c1 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/normalize/normalize_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/normalize/normalize_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [normalize_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/not/not_001_to_004.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/not/not_001_to_004.html.ini
index fadd69640d3..c29ed26ba87 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/not/not_001_to_004.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/not/not_001_to_004.html.ini
@@ -1,3 +1,3 @@
 [not_001_to_004.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/notEqual/notEqual_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/notEqual/notEqual_001_to_008.html.ini
index e35a43e675c..9fa03038c1f 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/notEqual/notEqual_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/notEqual/notEqual_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [notEqual_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/notEqual/notEqual_009_to_012.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/notEqual/notEqual_009_to_012.html.ini
index a1c0535c6d8..c9aed54908d 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/notEqual/notEqual_009_to_012.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/notEqual/notEqual_009_to_012.html.ini
@@ -1,3 +1,3 @@
 [notEqual_009_to_012.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_001_to_008.html.ini
index 5c3f70e0dcc..f88bc2e568a 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [operators_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_009_to_016.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_009_to_016.html.ini
index fad2a7719e1..e7f129980d9 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_009_to_016.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_009_to_016.html.ini
@@ -1,3 +1,3 @@
 [operators_009_to_016.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_017_to_024.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_017_to_024.html.ini
index 9cdec6f0802..653fc34e982 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_017_to_024.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_017_to_024.html.ini
@@ -1,3 +1,3 @@
 [operators_017_to_024.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_025_to_026.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_025_to_026.html.ini
index e9fe47d5038..5a43150c145 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_025_to_026.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/operators/operators_025_to_026.html.ini
@@ -1,3 +1,3 @@
 [operators_025_to_026.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_001_to_008.html.ini
index 2619a5a2d96..62e1e463526 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [pow_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_009_to_016.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_009_to_016.html.ini
index 56241410ba3..9862274d40e 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_009_to_016.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_009_to_016.html.ini
@@ -1,3 +1,3 @@
 [pow_009_to_016.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_017_to_024.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_017_to_024.html.ini
index 7d29c6850f0..89db75cf351 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_017_to_024.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/pow/pow_017_to_024.html.ini
@@ -1,3 +1,3 @@
 [pow_017_to_024.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/radians/radians_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/radians/radians_001_to_006.html.ini
index 3319fe0b981..61ac4d180cd 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/radians/radians_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/radians/radians_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [radians_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/reflect/reflect_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/reflect/reflect_001_to_006.html.ini
index 4c17fc5fb9c..f3d2fa71b2c 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/reflect/reflect_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/reflect/reflect_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [reflect_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/refract/refract_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/refract/refract_001_to_006.html.ini
index a3c90fd33a0..7f8e096dcde 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/refract/refract_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/refract/refract_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [refract_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sign/sign_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sign/sign_001_to_006.html.ini
index dfc2694cf2e..830e5822014 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sign/sign_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sign/sign_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [sign_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sin/sin_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sin/sin_001_to_006.html.ini
index 8e1c35d12bf..f22f14d959f 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sin/sin_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sin/sin_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [sin_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/smoothstep/smoothstep_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/smoothstep/smoothstep_001_to_006.html.ini
index 766eb5f82b5..1a7548cbdcc 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/smoothstep/smoothstep_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/smoothstep/smoothstep_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [smoothstep_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sqrt/sqrt_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sqrt/sqrt_001_to_006.html.ini
index 692f7d58c5a..8fcaaa12aef 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sqrt/sqrt_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/sqrt/sqrt_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [sqrt_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/step/step_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/step/step_001_to_006.html.ini
index cccb6a4b96d..85a01d13c88 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/step/step_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/step/step_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [step_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_001_to_008.html.ini
index 95e9d74e2db..12bb0cbef81 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [struct_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_009_to_016.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_009_to_016.html.ini
index 1eb8b4ead5b..c8be56fbc6a 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_009_to_016.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_009_to_016.html.ini
@@ -1,3 +1,3 @@
 [struct_009_to_016.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_017_to_024.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_017_to_024.html.ini
index 7f47355a9d9..a707798908a 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_017_to_024.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_017_to_024.html.ini
@@ -1,3 +1,3 @@
 [struct_017_to_024.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_025_to_032.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_025_to_032.html.ini
index 9e39038c00f..e34ed76d9de 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_025_to_032.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_025_to_032.html.ini
@@ -1,3 +1,3 @@
 [struct_025_to_032.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_033_to_040.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_033_to_040.html.ini
index c9e8c77b73b..9a5ff081633 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_033_to_040.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_033_to_040.html.ini
@@ -1,3 +1,3 @@
 [struct_033_to_040.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_041_to_048.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_041_to_048.html.ini
index 827f2957773..6967ab057c5 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_041_to_048.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_041_to_048.html.ini
@@ -1,3 +1,3 @@
 [struct_041_to_048.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_049_to_056.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_049_to_056.html.ini
index a6b396fb682..d3802c89162 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_049_to_056.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/struct/struct_049_to_056.html.ini
@@ -1,3 +1,3 @@
 [struct_049_to_056.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_001_to_008.html.ini
index 83d57a36b88..d9fe5e7fa85 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_009_to_016.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_009_to_016.html.ini
index 588e576fa78..db0fded39d3 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_009_to_016.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_009_to_016.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_009_to_016.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_017_to_024.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_017_to_024.html.ini
index 54aae378764..5181e9b6d07 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_017_to_024.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_017_to_024.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_017_to_024.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_025_to_032.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_025_to_032.html.ini
index 9988de9e05f..9313338bfaa 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_025_to_032.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_025_to_032.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_025_to_032.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_033_to_040.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_033_to_040.html.ini
index 6a90cbb7313..e62a2334abd 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_033_to_040.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_033_to_040.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_033_to_040.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_041_to_048.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_041_to_048.html.ini
index 5775eea9aa2..579a295c1a4 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_041_to_048.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_041_to_048.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_041_to_048.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_049_to_056.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_049_to_056.html.ini
index 4d5d51ff122..5b2125e9c72 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_049_to_056.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_049_to_056.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_049_to_056.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_057_to_064.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_057_to_064.html.ini
index 28d7b2caecd..ee85cf833f5 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_057_to_064.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_057_to_064.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_057_to_064.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_065_to_072.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_065_to_072.html.ini
index ce3066c07a7..41bfe8f01bc 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_065_to_072.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_065_to_072.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_065_to_072.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_073_to_080.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_073_to_080.html.ini
index 1cac3e2bff5..1f7eb3e6884 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_073_to_080.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_073_to_080.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_073_to_080.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_081_to_088.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_081_to_088.html.ini
index 75f55eadd56..960db832b18 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_081_to_088.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_081_to_088.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_081_to_088.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_089_to_096.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_089_to_096.html.ini
index f8bc702410a..ce394ab21d2 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_089_to_096.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_089_to_096.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_089_to_096.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_097_to_104.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_097_to_104.html.ini
index ada453eb5b7..6300f052a28 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_097_to_104.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_097_to_104.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_097_to_104.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_105_to_112.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_105_to_112.html.ini
index 8b9bf1d8faf..506d3df88c1 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_105_to_112.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_105_to_112.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_105_to_112.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_113_to_120.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_113_to_120.html.ini
index b021fd1cc7b..ed6fe78c316 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_113_to_120.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/swizzlers/swizzlers_113_to_120.html.ini
@@ -1,3 +1,3 @@
 [swizzlers_113_to_120.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/tan/tan_001_to_006.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/tan/tan_001_to_006.html.ini
index 63579b624fb..a9ce4c1d9e6 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/tan/tan_001_to_006.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/tan/tan_001_to_006.html.ini
@@ -1,3 +1,3 @@
 [tan_001_to_006.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_001_to_008.html.ini
index b279c8048dd..54636661f43 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [vec_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_009_to_016.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_009_to_016.html.ini
index 40589ea2f5e..a557c35f120 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_009_to_016.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_009_to_016.html.ini
@@ -1,3 +1,3 @@
 [vec_009_to_016.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_017_to_018.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_017_to_018.html.ini
index 7353b1ae01a..340309b3c83 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_017_to_018.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec/vec_017_to_018.html.ini
@@ -1,3 +1,3 @@
 [vec_017_to_018.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec3/vec3_001_to_008.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec3/vec3_001_to_008.html.ini
index 7ba9248ace2..a92997dc739 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec3/vec3_001_to_008.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/ogles/GL/vec3/vec3_001_to_008.html.ini
@@ -1,3 +1,3 @@
 [vec3_001_to_008.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/gl-bind-attrib-location-long-names-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/gl-bind-attrib-location-long-names-test.html.ini
index 564114a7d20..d5b7a13216b 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/gl-bind-attrib-location-long-names-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/gl-bind-attrib-location-long-names-test.html.ini
@@ -1,5 +1,6 @@
 [gl-bind-attrib-location-long-names-test.html]
   type: testharness
+  expected: ERROR
   [WebGL test #4: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/gl-bind-attrib-location-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/gl-bind-attrib-location-test.html.ini
index e7b102b3956..b618b447b95 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/gl-bind-attrib-location-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/gl-bind-attrib-location-test.html.ini
@@ -1,5 +1,6 @@
 [gl-bind-attrib-location-test.html]
   type: testharness
+  expected: ERROR
   [WebGL test #6: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini
index 5c9a548e8ad..e1ca38110b6 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/programs/program-test.html.ini
@@ -1,5 +1,6 @@
 [program-test.html]
   type: testharness
+  expected: ERROR
   [WebGL test #17: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/feedback-loop.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/feedback-loop.html.ini
index 80b7a714709..67298025ed2 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/feedback-loop.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/feedback-loop.html.ini
@@ -1,5 +1,6 @@
 [feedback-loop.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-object-attachment.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-object-attachment.html.ini
index 84d64395cb6..1ebc4ac1066 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-object-attachment.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-object-attachment.html.ini
@@ -1,5 +1,6 @@
 [framebuffer-object-attachment.html]
   type: testharness
+  expected: ERROR
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-state-restoration.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-state-restoration.html.ini
index f5501c18c57..c3b2db370fb 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-state-restoration.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-state-restoration.html.ini
@@ -1,5 +1,6 @@
 [framebuffer-state-restoration.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-test.html.ini
index 131e6d7d51d..6172d868b20 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/framebuffer-test.html.ini
@@ -1,5 +1,6 @@
 [framebuffer-test.html]
   type: testharness
+  expected: ERROR
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/renderbuffer-initialization.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/renderbuffer-initialization.html.ini
index 3e8dea14559..2d57461b214 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/renderbuffer-initialization.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/renderbuffers/renderbuffer-initialization.html.ini
@@ -1,5 +1,6 @@
 [renderbuffer-initialization.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/framebuffer-switch.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/framebuffer-switch.html.ini
index 663f6838fdb..fac175f8d3b 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/framebuffer-switch.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/framebuffer-switch.html.ini
@@ -1,3 +1,3 @@
 [framebuffer-switch.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/framebuffer-texture-switch.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/framebuffer-texture-switch.html.ini
index 2dafd674064..add397e569e 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/framebuffer-texture-switch.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/framebuffer-texture-switch.html.ini
@@ -1,3 +1,3 @@
 [framebuffer-texture-switch.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-fbo-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-fbo-test.html.ini
index c46acd960cd..ad1a5ccb284 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-fbo-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/gl-scissor-fbo-test.html.ini
@@ -1,5 +1,6 @@
 [gl-scissor-fbo-test.html]
   type: testharness
+  expected: ERROR
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html.ini
index 1de6aa8630a..93fa55590cd 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/many-draw-calls.html.ini
@@ -1,6 +1,6 @@
 [many-draw-calls.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [WebGL test #0: failed to create test program]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/multisample-corruption.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/multisample-corruption.html.ini
index a8c58c5ae4a..0992122040d 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/multisample-corruption.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/multisample-corruption.html.ini
@@ -1,5 +1,6 @@
 [multisample-corruption.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/point-size.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/point-size.html.ini
index 011ef347ec8..e460426a260 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/point-size.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/point-size.html.ini
@@ -1,5 +1,6 @@
 [point-size.html]
   type: testharness
+  expected: ERROR
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/point-with-gl-pointcoord-in-fragment-shader.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/point-with-gl-pointcoord-in-fragment-shader.html.ini
index e682ee5752d..cacda62cba5 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/point-with-gl-pointcoord-in-fragment-shader.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/rendering/point-with-gl-pointcoord-in-fragment-shader.html.ini
@@ -1,5 +1,6 @@
 [point-with-gl-pointcoord-in-fragment-shader.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-enum-tests.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-enum-tests.html.ini
index e6e8c0cdd0c..7683cb3d1f1 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-enum-tests.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-enum-tests.html.ini
@@ -1,5 +1,6 @@
 [gl-enum-tests.html]
   type: testharness
+  expected: ERROR
   [WebGL test #3: getError expected: INVALID_ENUM. Was NO_ERROR : gl.blendEquation(desktopGL['MIN'\]) should return INVALID_ENUM.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-get-calls.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-get-calls.html.ini
index 0027d7fc93b..aa36f7ebddf 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-get-calls.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-get-calls.html.ini
@@ -1,5 +1,6 @@
 [gl-get-calls.html]
   type: testharness
+  expected: ERROR
   [WebGL test #3: (context.getParameter(context.ALIASED_LINE_WIDTH_RANGE)[0\] <= 1) && (context.getParameter(context.ALIASED_LINE_WIDTH_RANGE)[0\] > 0) && (context.getParameter(context.ALIASED_LINE_WIDTH_RANGE)[1\] >= 1) should be true. Threw exception TypeError: context.getParameter(...) is null]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-geterror.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-geterror.html.ini
index ebe21398c3d..3d065d16f52 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-geterror.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-geterror.html.ini
@@ -1,4 +1,6 @@
 [gl-geterror.html]
   type: testharness
+  expected: ERROR
   [WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-object-get-calls.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-object-get-calls.html.ini
index 30c17d11a3f..169874503dd 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-object-get-calls.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/state/gl-object-get-calls.html.ini
@@ -1,5 +1,6 @@
 [gl-object-get-calls.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/copy-tex-image-2d-formats.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/copy-tex-image-2d-formats.html.ini
index 3bd72604ccd..a83b26a3250 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/copy-tex-image-2d-formats.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/copy-tex-image-2d-formats.html.ini
@@ -1,5 +1,6 @@
 [copy-tex-image-2d-formats.html]
   type: testharness
+  expected: ERROR
   [WebGL test #16: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/gl-pixelstorei.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/gl-pixelstorei.html.ini
index 04aa3908c85..585ea048d69 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/gl-pixelstorei.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/gl-pixelstorei.html.ini
@@ -1,5 +1,6 @@
 [gl-pixelstorei.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/mipmap-fbo.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/mipmap-fbo.html.ini
index 26d0b6d0615..f32f3f19116 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/mipmap-fbo.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/mipmap-fbo.html.ini
@@ -1,5 +1,6 @@
 [mipmap-fbo.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html.ini
index ccf1ef3349e..c36dffd3838 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html.ini
@@ -1,5 +1,6 @@
 [tex-image-and-sub-image-2d-with-array-buffer-view.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-with-invalid-data.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-with-invalid-data.html.ini
index 55a6e8d9dfb..045d0a5c870 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-with-invalid-data.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-image-with-invalid-data.html.ini
@@ -1,5 +1,6 @@
 [tex-image-with-invalid-data.html]
   type: testharness
+  expected: ERROR
   [WebGL test #1: getError expected: INVALID_OPERATION. Was NO_ERROR : ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-input-validation.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-input-validation.html.ini
index 922b2a70290..b01468ceb4c 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-input-validation.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-input-validation.html.ini
@@ -1,5 +1,6 @@
 [tex-input-validation.html]
   type: testharness
+  expected: ERROR
   [WebGL test #3: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d.html.ini
index 2dc6b40d3d9..f3d05dbb3ce 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/tex-sub-image-2d.html.ini
@@ -1,5 +1,6 @@
 [tex-sub-image-2d.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texparameter-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texparameter-test.html.ini
index d16debb3d11..e353d843a3c 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texparameter-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texparameter-test.html.ini
@@ -1,5 +1,6 @@
 [texparameter-test.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-active-bind-2.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-active-bind-2.html.ini
index 3aa92e97021..55491726102 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-active-bind-2.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-active-bind-2.html.ini
@@ -1,5 +1,6 @@
 [texture-active-bind-2.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-active-bind.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-active-bind.html.ini
index f9bf354eb2a..69b846cda72 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-active-bind.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-active-bind.html.ini
@@ -1,5 +1,6 @@
 [texture-active-bind.html]
   type: testharness
+  expected: ERROR
   [WebGL test #4: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-attachment-formats.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-attachment-formats.html.ini
index 8222ea5b01d..57049ef8261 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-attachment-formats.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-attachment-formats.html.ini
@@ -1,5 +1,6 @@
 [texture-attachment-formats.html]
   type: testharness
+  expected: ERROR
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-clear.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-clear.html.ini
index a50d408fbca..fa2842af295 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-clear.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-clear.html.ini
@@ -1,5 +1,6 @@
 [texture-clear.html]
   type: testharness
+  expected: ERROR
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini
index b570be0c937..bf07713d84b 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-copying-feedback-loops.html.ini
@@ -1,5 +1,6 @@
 [texture-copying-feedback-loops.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-draw-with-2d-and-cube.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-draw-with-2d-and-cube.html.ini
index 4171cd99060..c0cb1817206 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-draw-with-2d-and-cube.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-draw-with-2d-and-cube.html.ini
@@ -1,5 +1,6 @@
 [texture-draw-with-2d-and-cube.html]
   type: testharness
+  expected: ERROR
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-fakeblack.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-fakeblack.html.ini
index dc71afe66eb..74d50e4841e 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-fakeblack.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-fakeblack.html.ini
@@ -1,5 +1,6 @@
 [texture-fakeblack.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-formats-test.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-formats-test.html.ini
index 65ebed06d0e..d222aae0c5d 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-formats-test.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-formats-test.html.ini
@@ -1,5 +1,6 @@
 [texture-formats-test.html]
   type: testharness
+  expected: ERROR
   [WebGL test #1: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-mips.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-mips.html.ini
index f5b63a2a77d..b0b37cc4237 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-mips.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-mips.html.ini
@@ -1,5 +1,6 @@
 [texture-mips.html]
   type: testharness
+  expected: ERROR
   [WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-size-cube-maps.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-size-cube-maps.html.ini
index 4b7a0b20cd0..3b37ed29353 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-size-cube-maps.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-size-cube-maps.html.ini
@@ -1,3 +1,3 @@
 [texture-size-cube-maps.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-size-limit.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-size-limit.html.ini
index 9447365f926..da1ba4d40af 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-size-limit.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-size-limit.html.ini
@@ -1,6 +1,6 @@
 [texture-size-limit.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini
index 41d4267c9e6..b057d4a7cda 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-sub-image-cube-maps.html.ini
@@ -1,5 +1,6 @@
 [texture-sub-image-cube-maps.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-upload-cube-maps.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-upload-cube-maps.html.ini
index 99291ec52ff..b5a105a6a9b 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-upload-cube-maps.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/textures/texture-upload-cube-maps.html.ini
@@ -1,5 +1,6 @@
 [texture-upload-cube-maps.html]
   type: testharness
+  expected: ERROR
   [WebGL test #2: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/gl-uniformmatrix4fv.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/gl-uniformmatrix4fv.html.ini
index e0d3547af9c..b955597a622 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/gl-uniformmatrix4fv.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/gl-uniformmatrix4fv.html.ini
@@ -1,5 +1,6 @@
 [gl-uniformmatrix4fv.html]
   type: testharness
+  expected: ERROR
   [WebGL test #0: successfullyParsed should be true (of type boolean). Was undefined (of type undefined).]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini
index 993c55127dc..3941cdd91e2 100644
--- a/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini
+++ b/tests/wpt/metadata/webgl/conformance-1.0.3/conformance/uniforms/uniform-default-values.html.ini
@@ -2,4 +2,4 @@
   type: testharness
   expected:
     if os == "linux": CRASH
-    if os == "mac": TIMEOUT
+    if os == "mac": ERROR
diff --git a/tests/wpt/metadata/websockets/interfaces/WebSocket/events/013.html.ini b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/013.html.ini
new file mode 100644
index 00000000000..f526d43209e
--- /dev/null
+++ b/tests/wpt/metadata/websockets/interfaces/WebSocket/events/013.html.ini
@@ -0,0 +1,7 @@
+[013.html?wss]
+  type: testharness
+  expected: ERROR
+
+[013.html]
+  type: testharness
+  expected: ERROR
diff --git a/tests/wpt/metadata/webstorage/event_basic.html.ini b/tests/wpt/metadata/webstorage/event_basic.html.ini
index daad83f1e5f..041542bd593 100644
--- a/tests/wpt/metadata/webstorage/event_basic.html.ini
+++ b/tests/wpt/metadata/webstorage/event_basic.html.ini
@@ -1,5 +1,6 @@
 [event_basic.html]
   type: testharness
+  expected: ERROR
   [sessionStorage mutations fire StorageEvents that are caught by the event listener set via window.onstorage.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webstorage/event_body_attribute.html.ini b/tests/wpt/metadata/webstorage/event_body_attribute.html.ini
index 996df51b214..d710fe8392f 100644
--- a/tests/wpt/metadata/webstorage/event_body_attribute.html.ini
+++ b/tests/wpt/metadata/webstorage/event_body_attribute.html.ini
@@ -1,5 +1,6 @@
 [event_body_attribute.html]
   type: testharness
+  expected: ERROR
   [sessionStorage mutations fire StorageEvents that are caught by the event listener specified as an attribute on the body.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webstorage/event_case_sensitive.html.ini b/tests/wpt/metadata/webstorage/event_case_sensitive.html.ini
index 01ae1ddcc65..b45d8f59577 100644
--- a/tests/wpt/metadata/webstorage/event_case_sensitive.html.ini
+++ b/tests/wpt/metadata/webstorage/event_case_sensitive.html.ini
@@ -1,5 +1,6 @@
 [event_case_sensitive.html]
   type: testharness
+  expected: ERROR
   [sessionStorage storage events fire even when only the case of the value changes.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webstorage/event_setattribute.html.ini b/tests/wpt/metadata/webstorage/event_setattribute.html.ini
index f934b86f0b7..a46568a15ec 100644
--- a/tests/wpt/metadata/webstorage/event_setattribute.html.ini
+++ b/tests/wpt/metadata/webstorage/event_setattribute.html.ini
@@ -1,5 +1,6 @@
 [event_setattribute.html]
   type: testharness
+  expected: ERROR
   [sessionStorage mutations fire StorageEvents that are caught by the event listener attached via setattribute.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/semantics/multiple-workers/004.html.ini b/tests/wpt/metadata/workers/semantics/multiple-workers/004.html.ini
index 2c1c228a251..3e84eb29723 100644
--- a/tests/wpt/metadata/workers/semantics/multiple-workers/004.html.ini
+++ b/tests/wpt/metadata/workers/semantics/multiple-workers/004.html.ini
@@ -1,3 +1,3 @@
 [004.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index b9a85eb7cdb..d7b239354d4 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index c62bd03e2dd..77de0565e8c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index 9f2a08f870a..1b4976207e8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index 3c782a62742..3fbf793017c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index f4ee0bd7945..5725d94996f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index c6d84e9a243..a95f8104ff7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 5e03905a7ad..4eb6e467283 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index 0deac4d0ad1..decb42428e8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index 73a712b9f93..ea09456be80 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-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/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index b368beb3531..4240bf0b470 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index 75dacb23a9d..47b8c6a203a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index 7ba6d689215..35867391e26 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 6c2f6b3a348..fe3ac80b948 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index 3584828e82b..9afd60cd4e3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index fd9f515bf7c..2571038047a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index f9881118ac6..f56ef8adbba 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index c80ab5fe471..40f2a63e730 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index db68d86f1bc..3d6fd433573 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 5c33a109c4b..de1321af9f5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index f69856e0fa0..e2329e97fe0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index 6cbe9850a91..d5eddfe4bbd 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/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/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index a0d7a83edda..71c6db96aac 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index 6815d0e06c1..89e751e321f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index f0885ccf80a..5bd8722c23a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 0e8307cc03d..94d9eabb811 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index 00f7f44f559..6eafdaac068 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index f6bd10e6cd0..3f9eb243259 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index d0c21d94af5..65fa3c81967 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index 96472de0add..e9d3530d85c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index 6d611cd1b43..7effcc90102 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 3c894f5fd78..ded71be1ef4 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index f8ce72a6b9c..b182a48759d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index ab5a56d04d7..5b45bace885 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/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-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index d0e7ef7e901..c4804478079 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index 7036e8bb1c0..8647e42c3bc 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index a0bbb223921..89d77582b79 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
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
index 5b97b848da3..9ceab1b6869 100644
--- 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
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index 12dc0b4cc60..d93a3a1a389 100644
--- 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
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index 28a10f7ad3c..5562ab8c1e0 100644
--- 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
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index 97d4540701a..3523217b81d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index 2bd5fabef3d..d7f5a039ebf 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index 483ff5d7e64..b032bd4e932 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/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
index 4360e5994a4..66faa94cf4f 100644
--- 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
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index da3b5e40d01..b5d23d60d2b 100644
--- 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
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index ca104cf3653..d09882e0095 100644
--- 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
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index db6fe2446ac..f843e6b0ce0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index f536f1ff8b2..ef363e8e699 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index ef87fd00705..5ae2b5cdcdc 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer-when-downgrade/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index e8ae9a9fa4a..65693625498 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 1cef15d06b7..b777ce74c7f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 00fc22fb287..8118cfadcdf 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 7ed798404b4..55716d574ae 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 57e926549f3..3d073b9b318 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 739e66304de..e6ed38aab44 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 94609382df0..ed4e6c9151e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index e184911d0b6..7c7a75ba6c8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 4b5c50f6984..61228fec9ed 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 418b1ccff30..363f3303671 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 9961ddb67f1..27ac8ac9f75 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 22e9d797598..722ebbd6e01 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 735634385b2..558665f3b83 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 85a0fde74b8..3723d18c81a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index fdd3d57e53d..0f142c3cb03 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 893c8a02a39..5ba4beb7c02 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index d7e3432f900..49cacbfddec 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 82d870d2299..f71a1d914c3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 2b82fb03745..b5140842a5c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index d1f16b50f67..82574c89576 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index abadd550b43..5c8f3c0f2f1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 5387e2bd104..fc1b7001fb0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 97bc32ae14f..923c89ec422 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index e4968b05be2..af4d51c6ea0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 45e861c07c8..9a875ca509e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 6c4390a8c33..e48a657a2a3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 8e6740db5a9..b3fb3d38b38 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index d1108156a91..7eb99239ceb 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 26a4e300d1f..dc07e502de3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 018068f33d1..a771f7429e8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 2d980481f11..00d72aec80d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 18d48357237..1f31de63323 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 8334d9b5f90..8728fd8dc11 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index f2da3b77a3c..fbc094db14f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 11dcd18ea69..b8cb9420419 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 5ba8f07c15f..9b5ebd55291 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index ab5434e9a7f..a0b45e953af 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted 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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 3b69e5f2fbb..0a343ef7222 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted 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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 427f7680159..d3bc4b4ee0e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted 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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 61119c71a24..8488a035493 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 3ffd0cf8e2d..ac35eee583e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 2fa87ad2a07..eabca58f8ea 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 8105a5d1f3a..cd080da863b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted 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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 4795280367a..3bd60e5260c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted 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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index e754ced0b29..7384fb9389a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted 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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 05a4b601d63..69313c3d3e2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 9eceba897ae..b2e4228fff2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index bd73ee83bc1..2f2eccaf982 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/no-referrer/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 0f6ebb29bc7..53351d5fff5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
index e81efe8875b..ab5a1631e29 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 3205d6c70c1..3d1ebff9863 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 2541ae89ee2..56a46c13534 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index 51ea457c132..efa882a54c8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index ff0d8f28c4d..9b808033791 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
index fc255636c90..5154e5ef2cb 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
index 2702f6fbe07..b8952a1681d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index e2b76a5ed28..bc4518311fd 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-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/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
index f64b81a6204..87e580221f3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
index 4de1808bfe4..a542b21878c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
index 8b6eec196db..d8e8aea1f8c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 4c2f652082f..f832fe7a754 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
index ea5f69863d8..21131a7ef63 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
index c9c94e6b588..8ae2f91dec7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
index 450ff1a6eed..c8887a29de7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 041441f808d..e50f68433e2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
index 5dd9a170afe..a2ec0a829c1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index e63ec2db668..d5437d38217 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 270ee4b5013..4330dc9125e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index 99f74e16c6e..bacc584a4e6 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 18d7212d969..7fa94339a30 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
index 78dadb5c091..f9576cf4007 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
index 0029b3a6e9d..768f3e962be 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 15939e4990f..4dd79ef7a57 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/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/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
index fb7fdf8cf71..5352285d445 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
index 9c83887214a..aa244f1d3cf 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
index dfb2300bc95..198ef93a340 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 36f15146f68..4aeda7a2021 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
index 2dffef3a38a..fb872b0717e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
index fd2bf8335ae..2a7f2a84135 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
index 841077cacac..1e217a2cd5d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 211243e8553..a09075d5a55 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
index b3c2ce98294..621903bcb84 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 84bcf8e0232..e8e8722c723 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 53952042b89..97bb96b0ce7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index 815d27bf650..1f222096c9d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 42b89aafba9..94347c1fa15 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
index 1d1e8115ae3..9f656697996 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
index ff573e6a5f8..89aafa3d3d1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 0cd7baebc15..fe1407183ee 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/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-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
index 9bb25ab35a9..fce729fb8c0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
index c2683963ee5..3f713480a76 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
index 35e540ae7a0..d9f97b90e6d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 2bdd95b4681..be634ec22ee 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
index a5d52b49901..b1e99964cfd 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
index 4c06643bbce..dfa61163ae0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
index 002fce33954..33929677cf2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
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
index e40758daa80..fb6d983526a 100644
--- 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
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index 56bcff0427d..c7d6f8a7850 100644
--- 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
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index f7591b2e497..40c51b69683 100644
--- 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
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/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-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 735eac8227e..611839b3a3d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/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-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/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-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index bbaaf66c355..8de34cab02f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/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-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/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-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 681f62b60ca..4f2f3e630b3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/cross-origin/http-https/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-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/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
index 7244988f4e1..e41a45e7398 100644
--- 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
@@ -1,6 +1,6 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index 4c72209655e..f8173fdb8a3 100644
--- 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
@@ -1,6 +1,6 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index 3a435621d90..e81b673a138 100644
--- 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
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
index 66027ab9004..667cee68e23 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
index af3d7e5db7d..60f04e09f1f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
index 218a54983f7..08ea69289c7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-downgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/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-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 59e63fe644d..e20b6e93eb8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/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-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
index a83a421903f..058aa9a766d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
index 3b95a0d0c6c..f443e012295 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
index b86a991de81..c274d016f72 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin-when-cross-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-upgrade.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-upgrade.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index c4cf36b8c7d..345211b236c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 974817eefc8..c64b1fc7c92 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index c8d2cdf2c4c..545532b6853 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 774a6a6920b..a57e7b46d38 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 11924f4ccc3..676b7ed9c76 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index ba980a71e2a..7691443bbb0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index e30704398d8..5b79d4c8186 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 408a8af8deb..971371b8922 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 3007fa0bc10..5d2b8b5af56 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 1c906b0f939..380b48684cd 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 09a9219faf9..aa93b921fb2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 86c852d7ca8..18e4cbb365c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index c6d658b61f9..5b668b8f902 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 87ccdeedbc8..5d27d02f69c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index fbea467f58a..104bf1306b4 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 71967436084..62b591c38a5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index b370d0e7376..4c28991e0a3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index fb9630e7cac..2a8b2d9677a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 330ed0c01a6..4f452e7e8e7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 258b48527ae..cf062b19419 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 8a46a984e42..d23ac60bb39 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index bd2972f603a..f1632ef15c1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index a03c06079f3..afc1d2c4942 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 51ac037e8f2..91cc3ddfb3e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 24e171cd132..f6e1b63714e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index e27e3e0d72c..4a279eab525 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index acf4a71af96..da1493ca725 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index ea25ff64590..eb7d1017492 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 4c13b3aa844..6abf8bbf7f5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index c4a32847efa..b88d216923e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index aa99330f0b6..5cc4860fe07 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 443118fe4a3..449b5c7516c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index e54767c071a..11cc6c01971 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index ee95b1ad503..1888a1758b1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index e56185e96b9..365330861e8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 1bc79436ed2..129512b637b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 056a6d5d70c..3042265e13c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index af549eed7b8..30f590de44c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 486e94472d5..6be8b0e41ea 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index c0761aa7835..90ee5ca1fa3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 93bcd4d0e0d..16e856a7d46 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 6a54a3067bf..6616df93bbe 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 867df60b526..14a79b9b13c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index aa83b0b3074..e3ca478897a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 81449487393..f2342b39982 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index a9f434b01ad..32a8d561b73 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 927fb31577b..314a6ed3433 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 6d8058bd6ff..07cbf044544 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/origin/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index dd1c86bfc84..57cd89bbc96 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
index 8e0b7094e5b..14b10b90c2b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 959c5f903a1..fd310865b0b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 0ea0f8986a9..54eb563bac5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index 3ceeb95a663..d2aa836aa7d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 8cd7b49f9ee..4ee2ec629a2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
index fc255636c90..5154e5ef2cb 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
index 2702f6fbe07..b8952a1681d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 620d88013d4..24ead58a0e1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index edceb1d028e..5fb75af7e66 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index cf4624fe879..270f53843b7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
index 2137f5178ec..ee3ab25c7f4 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index b96365cea31..e29cb7df870 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 36cb626e129..3a9de157e34 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index 99aa7b95a67..fd29c310a11 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 12533213867..500ee3a4c83 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
index 78dadb5c091..f9576cf4007 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
index 0029b3a6e9d..768f3e962be 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 4e64e15d62f..4a107664d0b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 70d4e084fb6..5da6b778bab 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/http-rp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 135af1d3e80..a516e9a06e7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
index 69cfbde54d4..849c1d6ff50 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index d47ae823d78..336956e2fa3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index d6c78880815..9a03353dfac 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index 6e6f801990c..d6ba017e0c1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 980aebfa8dc..bb2eda3d519 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
index 1d1e8115ae3..9f656697996 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
index ff573e6a5f8..89aafa3d3d1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 8bb4c9a9bf4..1b9e65ab1d1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index 487743fb3d5..d8e8aeb21ef 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-csp/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-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/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index f382e1729cd..226d6b715a3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-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/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted 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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
index 458f664a7fb..72e040fe1f2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted 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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-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/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 1a4539316e2..9fa52d78983 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-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/same-origin/meta-referrer/cross-origin/http-http/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted 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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
index 36dc09cc2b1..2cc93659f5a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
index 1bfa15ddd22..c43380e9aea 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
index 2fdd4653b62..5d7089e6623 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/cross-origin/http-https/iframe-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [cross-origin.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-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/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
index 7244988f4e1..e41a45e7398 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-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/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-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/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
index 4c72209655e..f8173fdb8a3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-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/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-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/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index c256477bb35..206b0672107 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-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/same-origin/meta-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted 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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
index eb02f1d5d9c..af8330dd16f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/same-origin/meta-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [same-origin-insecure.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index da8b7021727..c69d3173ad1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index f07aa7d73e6..5983e5e1f3b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index efa17cb84f2..57b6e80319b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 20c2c352dae..f38d524bc20 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 0e0fee93a43..924f16a2bf5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 9d345291fdd..650581c6db2 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index fe3086b04d7..740c528704a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 4895a1c6b70..bc6a0c9cab6 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 00b4ae7b2f7..1dbbb7cb233 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 7902116967b..9d7ca680799 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index fc45cb69a3e..2877fad090e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index d622c5bfe5d..05f793855af 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 51303848c6f..2262f02d3f8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index f889a6435ea..a3aed80358c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 4376bff01c2..de99d1c394f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index c7f158ce6ad..b80d2c97b8e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 58945abe45b..ced93450d46 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index cf3a039a0de..1fa7e0e227e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 48e6a8d19ff..e7626bc18ec 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index a40f07422ef..d3e0262d502 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index ee53618f9d4..8c281f5a571 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 0822e0b48e7..5b2da0d1ded 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index 1ae8740d009..500fc3c2fc1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 96b28c4e098..30bc4017cca 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/http-rp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 48c5cabefb3..43721dbe811 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 2b2126162e2..29b8f50c60f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index f0421a0527a..252a59f9a68 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index a257f6a20d5..fec6320f111 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index c4395cf1cdc..2e397915672 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 88aa484313e..c54173a645e 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 5e2e844961f..9bce0db8b2a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
index 71b2b8409f9..513caec6447 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 6756240d4a6..84cb3cb2e9f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-http/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 0148f7c37c3..3bf3e6e6e83 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index f938f568bb5..004b521b870 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 3bd5727026c..c59b71dd1bc 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-csp/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
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
index 01bb30080a3..19f176e6e03 100644
--- 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
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index 2adf0a06c56..95ebad6904f 100644
--- 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
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index 9ef662acf43..6d4892cda61 100644
--- 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
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index 7d8126ae8b1..1ff8ce818c6 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index c4dde041832..22fb74a2781 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 98d8056639f..488d29ef46d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/cross-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/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
index cd394fadfbe..5299feb6f7c 100644
--- 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
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index c1a7e401e99..362f4efd0ef 100644
--- 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
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
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
index ca32587f682..8695c503ed4 100644
--- 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
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
index f46d36edec8..5d94291eb9a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
index f4e7b2f5b0c..9299241a4e1 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
index 18b5776cc11..a075d157d77 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unsafe-url/meta-referrer/same-origin/http-https/iframe-tag/generic.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [generic.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index b9a85eb7cdb..d7b239354d4 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index c62bd03e2dd..77de0565e8c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index 9f2a08f870a..1b4976207e8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index 3c782a62742..3fbf793017c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index f4ee0bd7945..5725d94996f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index c6d84e9a243..a95f8104ff7 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 5e03905a7ad..4eb6e467283 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index 0deac4d0ad1..decb42428e8 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index 73a712b9f93..ea09456be80 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index b368beb3531..4240bf0b470 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index 75dacb23a9d..47b8c6a203a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index 7ba6d689215..35867391e26 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 6c2f6b3a348..fe3ac80b948 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index 3584828e82b..9afd60cd4e3 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index fd9f515bf7c..2571038047a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index f9881118ac6..f56ef8adbba 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index c80ab5fe471..40f2a63e730 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index db68d86f1bc..3d6fd433573 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 5c33a109c4b..de1321af9f5 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index f69856e0fa0..e2329e97fe0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index 6cbe9850a91..d5eddfe4bbd 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an http\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index a0d7a83edda..71c6db96aac 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index 6815d0e06c1..89e751e321f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index f0885ccf80a..5bd8722c23a 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/http-rp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the http-rp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 0e8307cc03d..94d9eabb811 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index 00f7f44f559..6eafdaac068 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index f6bd10e6cd0..3f9eb243259 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index d0c21d94af5..65fa3c81967 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index 96472de0add..e9d3530d85c 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index 6d611cd1b43..7effcc90102 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 3c894f5fd78..ded71be1ef4 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index f8ce72a6b9c..b182a48759d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index ab5a56d04d7..5b45bace885 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index d0e7ef7e901..c4804478079 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index 7036e8bb1c0..8647e42c3bc 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index a0bbb223921..89d77582b79 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-csp/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-csp\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 5b97b848da3..9ceab1b6869 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index 12dc0b4cc60..d93a3a1a389 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index 28a10f7ad3c..5562ab8c1e0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index 97d4540701a..3523217b81d 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index 2bd5fabef3d..d7f5a039ebf 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index 483ff5d7e64..b032bd4e932 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
index 4360e5994a4..66faa94cf4f 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
index da3b5e40d01..b5d23d60d2b 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
index ca104cf3653..d09882e0095 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-http/iframe-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [insecure-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [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: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
index db6fe2446ac..f843e6b0ce0 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.keep-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
index f536f1ff8b2..ef363e8e699 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.no-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
index ef87fd00705..5ae2b5cdcdc 100644
--- a/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
+++ b/tests/wpt/mozilla/meta/mozilla/referrer-policy/unset-referrer-policy/meta-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -1,6 +1,6 @@
 [upgrade-protocol.swap-origin-redirect.http.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [The referrer URL is stripped-referrer when a\n                                 document served over http requires an https\n                                 sub-resource via iframe-tag using the meta-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
     expected: NOTRUN
 
diff --git a/tests/wpt/mozilla/meta/mozilla/window_requestAnimationFrame2.html.ini b/tests/wpt/mozilla/meta/mozilla/window_requestAnimationFrame2.html.ini
new file mode 100644
index 00000000000..380b6ae1998
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/window_requestAnimationFrame2.html.ini
@@ -0,0 +1,5 @@
+[window_requestAnimationFrame2.html]
+  type: testharness
+  [Test throwing an error inside requestAnimationFrame callback]
+    expected: FAIL
+