Update expected wpt-test results from build log

89 files changed, 287 insertions, 101 deletions

diff --git a/tests/wpt/metadata/fetch/api/basic/accept-header-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/accept-header-worker.html.ini
index 1e7d26fe991..bfa3c2541ee 100644
--- a/tests/wpt/metadata/fetch/api/basic/accept-header-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/accept-header-worker.html.ini
@@ -1,6 +1,6 @@
 [accept-header-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Request through fetch should have 'accept' header with value '*/*']
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/accept-header.html.ini b/tests/wpt/metadata/fetch/api/basic/accept-header.html.ini
index b9c856168d5..37fcce999ae 100644
--- a/tests/wpt/metadata/fetch/api/basic/accept-header.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/accept-header.html.ini
@@ -1,5 +1,6 @@
 [accept-header.html]
   type: testharness
+  expected: ERROR
   [Request through fetch should have 'accept' header with value '*/*']
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/integrity-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/integrity-worker.html.ini
index af295d2be57..87846c8b086 100644
--- a/tests/wpt/metadata/fetch/api/basic/integrity-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/integrity-worker.html.ini
@@ -1,6 +1,6 @@
 [integrity-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Empty string integrity]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/integrity.html.ini b/tests/wpt/metadata/fetch/api/basic/integrity.html.ini
index 107557220dc..d03764e2d93 100644
--- a/tests/wpt/metadata/fetch/api/basic/integrity.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/integrity.html.ini
@@ -1,5 +1,6 @@
 [integrity.html]
   type: testharness
+  expected: ERROR
   [Empty string integrity]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/mode-no-cors-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/mode-no-cors-worker.html.ini
index b45e5ac0fea..df894a38e3d 100644
--- a/tests/wpt/metadata/fetch/api/basic/mode-no-cors-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/mode-no-cors-worker.html.ini
@@ -1,6 +1,6 @@
 [mode-no-cors-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Fetch ../resources/top.txt with no-cors mode]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/mode-no-cors.html.ini b/tests/wpt/metadata/fetch/api/basic/mode-no-cors.html.ini
index 5cc109c8253..25c8023bca3 100644
--- a/tests/wpt/metadata/fetch/api/basic/mode-no-cors.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/mode-no-cors.html.ini
@@ -1,5 +1,6 @@
 [mode-no-cors.html]
   type: testharness
+  expected: ERROR
   [Fetch ../resources/top.txt with no-cors mode]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/mode-same-origin-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/mode-same-origin-worker.html.ini
index 72c180cc5f9..c144dce9ae8 100644
--- a/tests/wpt/metadata/fetch/api/basic/mode-same-origin-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/mode-same-origin-worker.html.ini
@@ -1,6 +1,6 @@
 [mode-same-origin-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Fetch ../resources/top.txt with same-origin mode]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/mode-same-origin.html.ini b/tests/wpt/metadata/fetch/api/basic/mode-same-origin.html.ini
index 60add93375c..f686dd26239 100644
--- a/tests/wpt/metadata/fetch/api/basic/mode-same-origin.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/mode-same-origin.html.ini
@@ -1,5 +1,6 @@
 [mode-same-origin.html]
   type: testharness
+  expected: ERROR
   [Fetch ../resources/top.txt with same-origin mode]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/referrer-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/referrer-worker.html.ini
new file mode 100644
index 00000000000..9a87b4afc06
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/basic/referrer-worker.html.ini
@@ -0,0 +1,6 @@
+[referrer-worker.html]
+  type: testharness
+  expected: ERROR
+  [origin-when-cross-origin policy on a same-origin URL]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/basic/referrer.html.ini b/tests/wpt/metadata/fetch/api/basic/referrer.html.ini
new file mode 100644
index 00000000000..537ded90ad0
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/basic/referrer.html.ini
@@ -0,0 +1,6 @@
+[referrer.html]
+  type: testharness
+  expected: ERROR
+  [origin-when-cross-origin policy on a same-origin URL]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/basic/request-forbidden-headers-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/request-forbidden-headers-worker.html.ini
index 8a98cefb979..ea73d296875 100644
--- a/tests/wpt/metadata/fetch/api/basic/request-forbidden-headers-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/request-forbidden-headers-worker.html.ini
@@ -1,6 +1,6 @@
 [request-forbidden-headers-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Accept-Charset is a forbidden request header]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/request-forbidden-headers.html.ini b/tests/wpt/metadata/fetch/api/basic/request-forbidden-headers.html.ini
index 4b789581b09..8aa5d585187 100644
--- a/tests/wpt/metadata/fetch/api/basic/request-forbidden-headers.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/request-forbidden-headers.html.ini
@@ -1,5 +1,6 @@
 [request-forbidden-headers.html]
   type: testharness
+  expected: ERROR
   [Accept-Charset is a forbidden request header]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/request-head-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/request-head-worker.html.ini
new file mode 100644
index 00000000000..524c58ef658
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/basic/request-head-worker.html.ini
@@ -0,0 +1,6 @@
+[request-head-worker.html]
+  type: testharness
+  expected: ERROR
+  [Fetch with HEAD with body]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/basic/request-head.html.ini b/tests/wpt/metadata/fetch/api/basic/request-head.html.ini
new file mode 100644
index 00000000000..8b5cd98e400
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/basic/request-head.html.ini
@@ -0,0 +1,6 @@
+[request-head.html]
+  type: testharness
+  expected: ERROR
+  [Fetch with HEAD with body]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/basic/request-headers-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/request-headers-worker.html.ini
index ddc46209622..be2dde863fe 100644
--- a/tests/wpt/metadata/fetch/api/basic/request-headers-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/request-headers-worker.html.ini
@@ -1,6 +1,6 @@
 [request-headers-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Fetch with GET]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/request-headers.html.ini b/tests/wpt/metadata/fetch/api/basic/request-headers.html.ini
index b5f549a9058..2df66a2b526 100644
--- a/tests/wpt/metadata/fetch/api/basic/request-headers.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/request-headers.html.ini
@@ -1,5 +1,6 @@
 [request-headers.html]
   type: testharness
+  expected: ERROR
   [Fetch with GET]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/request-referrer.html.ini b/tests/wpt/metadata/fetch/api/basic/request-referrer.html.ini
new file mode 100644
index 00000000000..067c8ca36cc
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/basic/request-referrer.html.ini
@@ -0,0 +1,6 @@
+[request-referrer.html]
+  type: testharness
+  expected: ERROR
+  [Fetch: fetch() respects Request referrer value]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/basic/response-url-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/response-url-worker.html.ini
index 75db05decfa..60a53e68a6f 100644
--- a/tests/wpt/metadata/fetch/api/basic/response-url-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/response-url-worker.html.ini
@@ -1,6 +1,6 @@
 [response-url-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Testing response url getter with http://web-platform.test:8000/ada]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/response-url.html.ini b/tests/wpt/metadata/fetch/api/basic/response-url.html.ini
index b106ec8d487..34cf700e548 100644
--- a/tests/wpt/metadata/fetch/api/basic/response-url.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/response-url.html.ini
@@ -1,5 +1,6 @@
 [response-url.html]
   type: testharness
+  expected: ERROR
   [Testing response url getter with http://web-platform.test:8000/ada]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-about-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-about-worker.html.ini
index def74ce5a31..8f934c2c7c8 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-about-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-about-worker.html.ini
@@ -1,6 +1,9 @@
 [scheme-about-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Fetching about:blank is OK]
     expected: FAIL
 
+  [Fetching about:blank (GET) is OK]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-about.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-about.html.ini
index d1cd5bacdcb..16959b7faf8 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-about.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-about.html.ini
@@ -1,5 +1,9 @@
 [scheme-about.html]
   type: testharness
+  expected: ERROR
   [Fetching about:blank is OK]
     expected: FAIL
 
+  [Fetching about:blank (GET) is OK]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-blob-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-blob-worker.html.ini
index 1106fb76805..61ab14604c2 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-blob-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-blob-worker.html.ini
@@ -1,6 +1,6 @@
 [scheme-blob-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Fetching [GET\] URL.createObjectURL(blob) is OK]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-blob.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-blob.html.ini
index 5d9c89a296f..ef6102c2839 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-blob.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-blob.html.ini
@@ -1,5 +1,6 @@
 [scheme-blob.html]
   type: testharness
+  expected: ERROR
   [Fetching [GET\] URL.createObjectURL(blob) is OK]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-data-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-data-worker.html.ini
index ac57c8e1015..c23d4dea90d 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-data-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-data-worker.html.ini
@@ -1,6 +1,6 @@
 [scheme-data-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Fetching data:,response%27s%20body is OK]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-data.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-data.html.ini
index 2cde50272b7..ac0ef42fd1a 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-data.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-data.html.ini
@@ -1,5 +1,6 @@
 [scheme-data.html]
   type: testharness
+  expected: ERROR
   [Fetching data:,response%27s%20body is OK]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-others-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-others-worker.html.ini
index 0af23dd09de..eb9d2502860 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-others-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-others-worker.html.ini
@@ -1,6 +1,6 @@
 [scheme-others-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Fetching aaa://web-platform.test:8000/ is KO]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/scheme-others.html.ini b/tests/wpt/metadata/fetch/api/basic/scheme-others.html.ini
index 2e4895593a7..f9098eaaeea 100644
--- a/tests/wpt/metadata/fetch/api/basic/scheme-others.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/scheme-others.html.ini
@@ -1,5 +1,6 @@
 [scheme-others.html]
   type: testharness
+  expected: ERROR
   [Fetching aaa://web-platform.test:8000/ is KO]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/stream-response-worker.html.ini b/tests/wpt/metadata/fetch/api/basic/stream-response-worker.html.ini
index b719f028c10..152791ed260 100644
--- a/tests/wpt/metadata/fetch/api/basic/stream-response-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/stream-response-worker.html.ini
@@ -1,6 +1,6 @@
 [stream-response-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Stream response's body]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/stream-response.html.ini b/tests/wpt/metadata/fetch/api/basic/stream-response.html.ini
index db2c00a1701..2ef568b5e32 100644
--- a/tests/wpt/metadata/fetch/api/basic/stream-response.html.ini
+++ b/tests/wpt/metadata/fetch/api/basic/stream-response.html.ini
@@ -1,5 +1,6 @@
 [stream-response.html]
   type: testharness
+  expected: ERROR
   [Stream response's body]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/basic/text-utf8.html.ini b/tests/wpt/metadata/fetch/api/basic/text-utf8.html.ini
new file mode 100644
index 00000000000..a6630d4ff11
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/basic/text-utf8.html.ini
@@ -0,0 +1,6 @@
+[text-utf8.html]
+  type: testharness
+  expected: ERROR
+  [UTF-8 with BOM with Request.text()]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-basic-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-basic-worker.html.ini
index 727101ba77b..a5ca70e74ba 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-basic-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-basic-worker.html.ini
@@ -1,6 +1,6 @@
 [cors-basic-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Same domain different port [no-cors mode\]]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-basic.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-basic.html.ini
index 585cc548273..aaffc3af099 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-basic.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-basic.html.ini
@@ -1,5 +1,6 @@
 [cors-basic.html]
   type: testharness
+  expected: ERROR
   [Same domain different port [no-cors mode\]]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-cookies-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-cookies-worker.html.ini
index d3cae49eeef..155d6fbea0a 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-cookies-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-cookies-worker.html.ini
@@ -1,6 +1,6 @@
 [cors-cookies-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Omit mode: no cookie sent]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-cookies.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-cookies.html.ini
index dcf0713d7c1..990fe5ed3ff 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-cookies.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-cookies.html.ini
@@ -1,5 +1,6 @@
 [cors-cookies.html]
   type: testharness
+  expected: ERROR
   [Omit mode: no cookie sent]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-filtering-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-filtering-worker.html.ini
index a61e97791b9..8ef5e2869b9 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-filtering-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-filtering-worker.html.ini
@@ -1,6 +1,6 @@
 [cors-filtering-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [CORS filter on Cache-Control header]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-filtering.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-filtering.html.ini
index 0f9b3c2e092..798398557a6 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-filtering.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-filtering.html.ini
@@ -1,5 +1,6 @@
 [cors-filtering.html]
   type: testharness
+  expected: ERROR
   [CORS filter on Cache-Control header]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins-worker.html.ini
index 7324d84c23a..ac423bf8694 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins-worker.html.ini
@@ -1,6 +1,6 @@
 [cors-multiple-origins-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [3 origins allowed, match the 3rd (http://web-platform.test:8000)]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins.html.ini
index 91548c6f608..64ee7f7f07e 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins.html.ini
@@ -1,5 +1,6 @@
 [cors-multiple-origins.html]
   type: testharness
+  expected: ERROR
   [3 origins allowed, match the 3rd (http://web-platform.test:8000)]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-no-preflight-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-no-preflight-worker.html.ini
index 94dc1e97da2..3ff17e4bb97 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-no-preflight-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-no-preflight-worker.html.ini
@@ -1,6 +1,6 @@
 [cors-no-preflight-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Cross domain basic usage [GET\]]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-no-preflight.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-no-preflight.html.ini
index 6d5e6bcb243..569d12bed62 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-no-preflight.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-no-preflight.html.ini
@@ -1,5 +1,6 @@
 [cors-no-preflight.html]
   type: testharness
+  expected: ERROR
   [Cross domain basic usage [GET\]]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-origin-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-origin-worker.html.ini
index 95ac244be88..95a91dc7455 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-origin-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-origin-worker.html.ini
@@ -1,6 +1,6 @@
 [cors-origin-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Cross domain different subdomain [origin OK\]]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-origin.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-origin.html.ini
index 19103e087d5..0d544aa6a2f 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-origin.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-origin.html.ini
@@ -1,5 +1,6 @@
 [cors-origin.html]
   type: testharness
+  expected: ERROR
   [Cross domain different subdomain [origin OK\]]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect-worker.html.ini
index 8fcc06dcede..26eea757fad 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect-worker.html.ini
@@ -1,6 +1,6 @@
 [cors-preflight-redirect-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Redirection 301 on preflight failed]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect.html.ini
index 2ef7e3d02ab..3c3cacce2da 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-preflight-redirect.html.ini
@@ -1,5 +1,6 @@
 [cors-preflight-redirect.html]
   type: testharness
+  expected: ERROR
   [Redirection 301 on preflight failed]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-referrer-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-referrer-worker.html.ini
index ece9b81932a..53ae9e589c3 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-referrer-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-preflight-referrer-worker.html.ini
@@ -1,6 +1,6 @@
 [cors-preflight-referrer-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Referrer policy: no-referrer]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-referrer.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-referrer.html.ini
index 58df388d808..ed1ede0b61a 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-referrer.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-preflight-referrer.html.ini
@@ -1,5 +1,6 @@
 [cors-preflight-referrer.html]
   type: testharness
+  expected: ERROR
   [Referrer policy: no-referrer]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-status-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-status-worker.html.ini
index d2e96ff3572..dc410f496bf 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-status-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-preflight-status-worker.html.ini
@@ -1,6 +1,6 @@
 [cors-preflight-status-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Preflight answered with status 200]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-status.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-status.html.ini
index ea5b6a80c39..967da55cd91 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-status.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-preflight-status.html.ini
@@ -1,5 +1,6 @@
 [cors-preflight-status.html]
   type: testharness
+  expected: ERROR
   [Preflight answered with status 200]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-worker.html.ini
index c320b141a84..0f5d647c528 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-preflight-worker.html.ini
@@ -1,3 +1,6 @@
 [cors-preflight-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
+  [CORS [DELETE\], server allows]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight.html.ini
index d45676a6c79..5a05bb7571b 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-preflight.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-preflight.html.ini
@@ -1,3 +1,6 @@
 [cors-preflight.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
+  [CORS [DELETE\], server allows]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials-worker.html.ini
index a4cb2d65951..dac671529c5 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials-worker.html.ini
@@ -1,6 +1,6 @@
 [cors-redirect-credentials-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Redirect 301 from same origin to remote with user and password]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials.html.ini
index 71cb2386c46..b34f27e846e 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-redirect-credentials.html.ini
@@ -1,5 +1,6 @@
 [cors-redirect-credentials.html]
   type: testharness
+  expected: ERROR
   [Redirect 301 from same origin to remote with user and password]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect-preflight-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect-preflight-worker.html.ini
new file mode 100644
index 00000000000..90452efd98d
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/cors/cors-redirect-preflight-worker.html.ini
@@ -0,0 +1,6 @@
+[cors-redirect-preflight-worker.html]
+  type: testharness
+  expected: ERROR
+  [Redirect 301: same origin to cors (preflight after redirection success case)]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect-preflight.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect-preflight.html.ini
new file mode 100644
index 00000000000..b3d6e7c2407
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/cors/cors-redirect-preflight.html.ini
@@ -0,0 +1,6 @@
+[cors-redirect-preflight.html]
+  type: testharness
+  expected: ERROR
+  [Redirect 301: same origin to cors (preflight after redirection success case)]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect-worker.html.ini
index 062a0307bb3..2729220e3f5 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-redirect-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-redirect-worker.html.ini
@@ -1,6 +1,6 @@
 [cors-redirect-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Redirect 301: cors to same cors]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-redirect.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-redirect.html.ini
index dcf9bfacd72..d2f89f813b2 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-redirect.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-redirect.html.ini
@@ -1,5 +1,6 @@
 [cors-redirect.html]
   type: testharness
+  expected: ERROR
   [Redirect 301: cors to same cors]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/credentials/authentication-basic-worker.html.ini b/tests/wpt/metadata/fetch/api/credentials/authentication-basic-worker.html.ini
index 7fe28c4007a..4cd7132501d 100644
--- a/tests/wpt/metadata/fetch/api/credentials/authentication-basic-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/credentials/authentication-basic-worker.html.ini
@@ -1,6 +1,6 @@
 [authentication-basic-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [User-added Authorization header with include mode]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/credentials/authentication-basic.html.ini b/tests/wpt/metadata/fetch/api/credentials/authentication-basic.html.ini
index 4bd5d62d690..9e85b136c08 100644
--- a/tests/wpt/metadata/fetch/api/credentials/authentication-basic.html.ini
+++ b/tests/wpt/metadata/fetch/api/credentials/authentication-basic.html.ini
@@ -1,5 +1,6 @@
 [authentication-basic.html]
   type: testharness
+  expected: ERROR
   [User-added Authorization header with include mode]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/credentials/cookies-worker.html.ini b/tests/wpt/metadata/fetch/api/credentials/cookies-worker.html.ini
index bf5e745d99d..0aaaa1af18c 100644
--- a/tests/wpt/metadata/fetch/api/credentials/cookies-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/credentials/cookies-worker.html.ini
@@ -1,6 +1,6 @@
 [cookies-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Include mode: 1 cookie]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/credentials/cookies.html.ini b/tests/wpt/metadata/fetch/api/credentials/cookies.html.ini
index 9fab4a09e47..d93de729b7b 100644
--- a/tests/wpt/metadata/fetch/api/credentials/cookies.html.ini
+++ b/tests/wpt/metadata/fetch/api/credentials/cookies.html.ini
@@ -1,5 +1,6 @@
 [cookies.html]
   type: testharness
+  expected: ERROR
   [Include mode: 1 cookie]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/policies/csp-blocked-worker.html.ini b/tests/wpt/metadata/fetch/api/policies/csp-blocked-worker.html.ini
index 4d1c4553af7..44a5d81a5bc 100644
--- a/tests/wpt/metadata/fetch/api/policies/csp-blocked-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/policies/csp-blocked-worker.html.ini
@@ -1,6 +1,6 @@
 [csp-blocked-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Fetch is blocked by CSP, got a TypeError]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/policies/csp-blocked.html.ini b/tests/wpt/metadata/fetch/api/policies/csp-blocked.html.ini
index 72555302f16..e5d6934e19b 100644
--- a/tests/wpt/metadata/fetch/api/policies/csp-blocked.html.ini
+++ b/tests/wpt/metadata/fetch/api/policies/csp-blocked.html.ini
@@ -1,5 +1,6 @@
 [csp-blocked.html]
   type: testharness
+  expected: ERROR
   [Fetch is blocked by CSP, got a TypeError]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/policies/referrer-no-referrer-worker.html.ini b/tests/wpt/metadata/fetch/api/policies/referrer-no-referrer-worker.html.ini
index 3c9d2e86d55..116bdf51474 100644
--- a/tests/wpt/metadata/fetch/api/policies/referrer-no-referrer-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/policies/referrer-no-referrer-worker.html.ini
@@ -1,6 +1,6 @@
 [referrer-no-referrer-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Request's referrer is empty]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/policies/referrer-no-referrer.html.ini b/tests/wpt/metadata/fetch/api/policies/referrer-no-referrer.html.ini
index 8461d3e1fdb..2d672e9e8ed 100644
--- a/tests/wpt/metadata/fetch/api/policies/referrer-no-referrer.html.ini
+++ b/tests/wpt/metadata/fetch/api/policies/referrer-no-referrer.html.ini
@@ -1,5 +1,6 @@
 [referrer-no-referrer.html]
   type: testharness
+  expected: ERROR
   [Request's referrer is empty]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/policies/referrer-origin-when-cross-origin-worker.html.ini b/tests/wpt/metadata/fetch/api/policies/referrer-origin-when-cross-origin-worker.html.ini
new file mode 100644
index 00000000000..48ca82dea3c
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/policies/referrer-origin-when-cross-origin-worker.html.ini
@@ -0,0 +1,6 @@
+[referrer-origin-when-cross-origin-worker.html]
+  type: testharness
+  expected: ERROR
+  [Request's referrer is origin]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/policies/referrer-origin-when-cross-origin.html.ini b/tests/wpt/metadata/fetch/api/policies/referrer-origin-when-cross-origin.html.ini
new file mode 100644
index 00000000000..267fc068c4c
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/policies/referrer-origin-when-cross-origin.html.ini
@@ -0,0 +1,6 @@
+[referrer-origin-when-cross-origin.html]
+  type: testharness
+  expected: ERROR
+  [Request's referrer is origin]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/policies/referrer-origin-worker.html.ini b/tests/wpt/metadata/fetch/api/policies/referrer-origin-worker.html.ini
index ce815c57184..2da4215afb4 100644
--- a/tests/wpt/metadata/fetch/api/policies/referrer-origin-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/policies/referrer-origin-worker.html.ini
@@ -1,6 +1,6 @@
 [referrer-origin-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Request's referrer is origin]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/policies/referrer-origin.html.ini b/tests/wpt/metadata/fetch/api/policies/referrer-origin.html.ini
index 141af27077e..3a7cdef8f00 100644
--- a/tests/wpt/metadata/fetch/api/policies/referrer-origin.html.ini
+++ b/tests/wpt/metadata/fetch/api/policies/referrer-origin.html.ini
@@ -1,5 +1,6 @@
 [referrer-origin.html]
   type: testharness
+  expected: ERROR
   [Request's referrer is origin]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/policies/referrer-unsafe-url-worker.html.ini b/tests/wpt/metadata/fetch/api/policies/referrer-unsafe-url-worker.html.ini
index b934dbb28e2..980cbf19072 100644
--- a/tests/wpt/metadata/fetch/api/policies/referrer-unsafe-url-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/policies/referrer-unsafe-url-worker.html.ini
@@ -1,6 +1,6 @@
 [referrer-unsafe-url-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Request's referrer is the full url of current document/worker]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/policies/referrer-unsafe-url.html.ini b/tests/wpt/metadata/fetch/api/policies/referrer-unsafe-url.html.ini
index 5792e4d649e..b340d2984e9 100644
--- a/tests/wpt/metadata/fetch/api/policies/referrer-unsafe-url.html.ini
+++ b/tests/wpt/metadata/fetch/api/policies/referrer-unsafe-url.html.ini
@@ -1,5 +1,6 @@
 [referrer-unsafe-url.html]
   type: testharness
+  expected: ERROR
   [Request's referrer is the full url of current document/worker]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini
index 623ff09eccf..3e3db9225a7 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini
@@ -1,6 +1,6 @@
 [redirect-count-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Redirect 301 20 times]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini
index c6a4133622d..eb07b8134a8 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini
@@ -1,5 +1,6 @@
 [redirect-count.html]
   type: testharness
+  expected: ERROR
   [Redirect 301 20 times]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-location-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-location-worker.html.ini
index daf831e012c..52f5bbdb3ee 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-location-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-location-worker.html.ini
@@ -1,6 +1,6 @@
 [redirect-location-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Redirect 301 in "follow" mode without location]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-location.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-location.html.ini
index 1209d0be6d2..892b154e98d 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-location.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-location.html.ini
@@ -1,5 +1,6 @@
 [redirect-location.html]
   type: testharness
+  expected: ERROR
   [Redirect 301 in "follow" mode without location]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-method-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-method-worker.html.ini
index cac984e4c51..e199a37ffe2 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-method-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-method-worker.html.ini
@@ -1,6 +1,6 @@
 [redirect-method-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Response.redirected should be false on not-redirected responses]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-method.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-method.html.ini
index c9dae7bff54..62da2b5f620 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-method.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-method.html.ini
@@ -1,5 +1,6 @@
 [redirect-method.html]
   type: testharness
+  expected: ERROR
   [Response.redirected should be false on not-redirected responses]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-mode-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-mode-worker.html.ini
index 5e059ffc3e9..0359908d8ab 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-mode-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-mode-worker.html.ini
@@ -1,6 +1,6 @@
 [redirect-mode-worker.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Redirect 301 in "error" mode ]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-mode.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-mode.html.ini
index b9eab53957d..aef52947ae5 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-mode.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-mode.html.ini
@@ -1,5 +1,6 @@
 [redirect-mode.html]
   type: testharness
+  expected: ERROR
   [Redirect 301 in "error" mode ]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini
new file mode 100644
index 00000000000..d4315e6c9dd
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini
@@ -0,0 +1,6 @@
+[redirect-origin-worker.html]
+  type: testharness
+  expected: ERROR
+  [Same origin to same origin redirection 301]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini
new file mode 100644
index 00000000000..bbc6a976e58
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini
@@ -0,0 +1,6 @@
+[redirect-origin.html]
+  type: testharness
+  expected: ERROR
+  [Same origin to same origin redirection 301]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-schemes.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-schemes.html.ini
index 61cffadf6f1..4e7cc9a2e1b 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-schemes.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-schemes.html.ini
@@ -1,3 +1,6 @@
 [redirect-schemes.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
+  [Fetch: handling different schemes in redirects]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl-worker.html.ini
new file mode 100644
index 00000000000..ab84a9a805b
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl-worker.html.ini
@@ -0,0 +1,6 @@
+[redirect-to-dataurl-worker.html]
+  type: testharness
+  expected: ERROR
+  [Testing data URL loading after same-origin redirection (cors mode)]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl.html.ini
new file mode 100644
index 00000000000..3629a7ba3e1
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-to-dataurl.html.ini
@@ -0,0 +1,6 @@
+[redirect-to-dataurl.html]
+  type: testharness
+  expected: ERROR
+  [Testing data URL loading after same-origin redirection (cors mode)]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/fetch/nosniff/image.html.ini b/tests/wpt/metadata/fetch/nosniff/image.html.ini
new file mode 100644
index 00000000000..d335ef05fb5
--- /dev/null
+++ b/tests/wpt/metadata/fetch/nosniff/image.html.ini
@@ -0,0 +1,14 @@
+[image.html]
+  type: testharness
+  [URL query: ]
+    expected: FAIL
+
+  [URL query: ?type=]
+    expected: FAIL
+
+  [URL query: ?type=x]
+    expected: FAIL
+
+  [URL query: ?type=x/x]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/importscripts.html.ini b/tests/wpt/metadata/fetch/nosniff/importscripts.html.ini
new file mode 100644
index 00000000000..2e04036194e
--- /dev/null
+++ b/tests/wpt/metadata/fetch/nosniff/importscripts.html.ini
@@ -0,0 +1,5 @@
+[importscripts.html]
+  type: testharness
+  [Test importScripts()]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.html.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.html.ini
new file mode 100644
index 00000000000..1b49f9f96e1
--- /dev/null
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.html.ini
@@ -0,0 +1,8 @@
+[parsing-nosniff.html]
+  type: testharness
+  [URL query: first]
+    expected: FAIL
+
+  [URL query: uppercase]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/script.html.ini b/tests/wpt/metadata/fetch/nosniff/script.html.ini
new file mode 100644
index 00000000000..68dd7064313
--- /dev/null
+++ b/tests/wpt/metadata/fetch/nosniff/script.html.ini
@@ -0,0 +1,14 @@
+[script.html]
+  type: testharness
+  [URL query: ]
+    expected: FAIL
+
+  [URL query: ?type=]
+    expected: FAIL
+
+  [URL query: ?type=x]
+    expected: FAIL
+
+  [URL query: ?type=x/x]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/worker.html.ini b/tests/wpt/metadata/fetch/nosniff/worker.html.ini
new file mode 100644
index 00000000000..0131291f8ac
--- /dev/null
+++ b/tests/wpt/metadata/fetch/nosniff/worker.html.ini
@@ -0,0 +1,14 @@
+[worker.html]
+  type: testharness
+  [URL query: ]
+    expected: FAIL
+
+  [URL query: ?type=]
+    expected: FAIL
+
+  [URL query: ?type=x]
+    expected: FAIL
+
+  [URL query: ?type=x/x]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/interfaces.worker.js.ini b/tests/wpt/metadata/workers/interfaces.worker.js.ini
index 1277160775a..a3335ec02ae 100644
--- a/tests/wpt/metadata/workers/interfaces.worker.js.ini
+++ b/tests/wpt/metadata/workers/interfaces.worker.js.ini
@@ -3,7 +3,6 @@
   expected:
     if os == "mac": TIMEOUT
     if os == "linux": CRASH
-
   [WorkerGlobalScope interface: operation close()]
     expected: FAIL