diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini
index c1e9baedb5c..ba7c4edf1f3 100644
--- a/tests/wpt/include.ini
+++ b/tests/wpt/include.ini
@@ -177,6 +177,8 @@ skip: true
   skip: false
 [webgl]
   skip: false
+[webidl]
+  skip: false
 [webvr]
   skip: false
 [webvtt]
@@ -187,8 +189,6 @@ skip: true
   skip: false
   [dom-overlay]
     skip: true
-[webidl]
-  skip: false
 [webmessaging]
   skip: false
 [websockets]
diff --git a/tests/wpt/metadata-layout-2020/websockets/stream/tentative/abort.any.js.ini b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/abort.any.js.ini
index 27a6b5b0d5e..4a51d7ffe09 100644
--- a/tests/wpt/metadata-layout-2020/websockets/stream/tentative/abort.any.js.ini
+++ b/tests/wpt/metadata-layout-2020/websockets/stream/tentative/abort.any.js.ini
@@ -55,7 +55,14 @@
   expected: ERROR
 
 [abort.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [abort before constructing should prevent connection]
+    expected: FAIL
+
+  [abort during handshake should work]
+    expected: FAIL
+
+  [abort after connect should do nothing]
+    expected: FAIL
 
 [abort.any.serviceworker.html?wss]
   expected: ERROR
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-upload.h2.any.js.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-upload.h2.any.js.ini
index 12b1b2b78d9..6d1e4faf5c8 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-upload.h2.any.js.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-upload.h2.any.js.ini
@@ -1,6 +1,3 @@
-[redirect-upload.h2.any.html]
-  expected: TIMEOUT
-
 [redirect-upload.h2.any.sharedworker.html]
   expected: ERROR
 
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
index 5ebb15c6a11..6b8d85d5f07 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/load-pageshow-events-iframe-contentWindow.html.ini
@@ -2,11 +2,14 @@
   [load & pageshow event do not fire on contentWindow of <iframe> element created with no src]
     expected: FAIL
 
-  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
-    expected: FAIL
-
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank#foo']
     expected: FAIL
 
   [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank?foo']
     expected: FAIL
+
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='about:blank']
+    expected: FAIL
+
+  [load & pageshow events do not fire on contentWindow of <iframe> element created with src='']
+    expected: FAIL
diff --git a/tests/wpt/metadata/webidl/current-realm.html.ini b/tests/wpt/metadata/webidl/current-realm.html.ini
index 66f0d3671a7..a2c668873b7 100644
--- a/tests/wpt/metadata/webidl/current-realm.html.ini
+++ b/tests/wpt/metadata/webidl/current-realm.html.ini
@@ -1,4 +1,4 @@
-[current-realm.html.ini]
+[current-realm.html]
   [createImageData]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/class-string-named-properties-object.window.js.ini b/tests/wpt/metadata/webidl/ecmascript-binding/class-string-named-properties-object.window.js.ini
new file mode 100644
index 00000000000..c16ce1eec8c
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/class-string-named-properties-object.window.js.ini
@@ -0,0 +1,7 @@
+[class-string-named-properties-object.window.html]
+  [@@toStringTag exists with the appropriate descriptor]
+    expected: FAIL
+
+  [Object.prototype.toString]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/constructors.html.ini b/tests/wpt/metadata/webidl/ecmascript-binding/constructors.html.ini
new file mode 100644
index 00000000000..aa8cf05b758
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/constructors.html.ini
@@ -0,0 +1,36 @@
+[constructors.html]
+  [Constructor in child window with normal NewTarget from parent window]
+    expected: FAIL
+
+  [Constructor in parent window with normal NewTarget from child window]
+    expected: FAIL
+
+  [Subclass constructor in parent window]
+    expected: FAIL
+
+  [Subclass constructor in child window]
+    expected: FAIL
+
+  [Subclass constructor in parent window with parent class in child window]
+    expected: FAIL
+
+  [Subclass constructor in child window with parent class in parent window]
+    expected: FAIL
+
+  [Constructor in child window with bad NewTarget from parent window]
+    expected: FAIL
+
+  [Constructor in parent window with bad NewTarget from child window]
+    expected: FAIL
+
+  [Constructor in parent window with bad NewTarget from parent window that's a bound child window function]
+    expected: FAIL
+
+  [Constructor in child window with bad NewTarget from child window that's a bound parent window function]
+    expected: FAIL
+
+  [Constructor in parent window with bad NewTarget from parent window that's a proxy for a child window function]
+    expected: FAIL
+
+  [Constructor in child window with bad NewTarget from child window that's a proxy for a parent window function]
+    expected: FAIL
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/global-immutable-prototype.any.js.ini b/tests/wpt/metadata/webidl/ecmascript-binding/global-immutable-prototype.any.js.ini
new file mode 100644
index 00000000000..642963d7cad
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/global-immutable-prototype.any.js.ini
@@ -0,0 +1,13 @@
+[global-immutable-prototype.any.html]
+  [Setting to a different prototype]
+    expected: FAIL
+
+[global-immutable-prototype.any.worker.html]
+  [Setting to a different prototype]
+    expected: FAIL
+
+[global-immutable-prototype.any.serviceworker.html]
+  expected: ERROR
+
+[global-immutable-prototype.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/global-object-implicit-this-value-cross-realm.html.ini b/tests/wpt/metadata/webidl/ecmascript-binding/global-object-implicit-this-value-cross-realm.html.ini
new file mode 100644
index 00000000000..bbfb3d02b0f
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/global-object-implicit-this-value-cross-realm.html.ini
@@ -0,0 +1,6 @@
+[global-object-implicit-this-value-cross-realm.html]
+  [Cross-realm global object's operation called on null / undefined]
+    expected: FAIL
+
+  [Cross-realm global object's operation throws when called on incompatible object]
+    expected: FAIL
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/global-object-implicit-this-value.any.js.ini b/tests/wpt/metadata/webidl/ecmascript-binding/global-object-implicit-this-value.any.js.ini
new file mode 100644
index 00000000000..d3e5457d4dc
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/global-object-implicit-this-value.any.js.ini
@@ -0,0 +1,28 @@
+[global-object-implicit-this-value.any.html]
+  [Global object's getter throws when called on incompatible object (document.all)]
+    expected: FAIL
+
+  [Global object's setter throws when called on incompatible object (document.all)]
+    expected: FAIL
+
+  [Global object's operation throws when called on incompatible object (document.all)]
+    expected: FAIL
+
+[global-object-implicit-this-value.any.worker.html]
+  [Global object's setter throws when called on incompatible object]
+    expected: FAIL
+
+  [Global object's setter throws when called on incompatible object]
+    expected: FAIL
+
+  [Global object's getter works when called on null / undefined]
+    expected: FAIL
+
+  [Global object's setter works when called on null / undefined]
+    expected: FAIL
+
+[global-object-implicit-this-value.any.serviceworker.html]
+  expected: ERROR
+
+[global-object-implicit-this-value.any.sharedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/interface-prototype-constructor-set-receiver.html.ini b/tests/wpt/metadata/webidl/ecmascript-binding/interface-prototype-constructor-set-receiver.html.ini
new file mode 100644
index 00000000000..a8812c9bd59
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/interface-prototype-constructor-set-receiver.html.ini
@@ -0,0 +1,3 @@
+[interface-prototype-constructor-set-receiver.html]
+  [Direct [[Set\]\] preserves [[Enumerable\]\]: false property attribute]
+    expected: FAIL
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/interface-prototype-object.html.ini b/tests/wpt/metadata/webidl/ecmascript-binding/interface-prototype-object.html.ini
new file mode 100644
index 00000000000..d6427d91f6a
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/interface-prototype-object.html.ini
@@ -0,0 +1,3 @@
+[interface-prototype-object.html]
+  [[Unscopable\] extended attribute makes @@unscopables object on the prototype object, whose prototype is null.]
+    expected: FAIL
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/invalid-this-value-cross-realm.html.ini b/tests/wpt/metadata/webidl/ecmascript-binding/invalid-this-value-cross-realm.html.ini
new file mode 100644
index 00000000000..c592c227df2
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/invalid-this-value-cross-realm.html.ini
@@ -0,0 +1,6 @@
+[invalid-this-value-cross-realm.html]
+  [Cross-realm operation throws when called on incompatible object]
+    expected: FAIL
+
+  [Cross-realm setter throws when called on incompatible object]
+    expected: FAIL
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/legacy-callback-interface-object.html.ini b/tests/wpt/metadata/webidl/ecmascript-binding/legacy-callback-interface-object.html.ini
new file mode 100644
index 00000000000..c228c240113
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/legacy-callback-interface-object.html.ini
@@ -0,0 +1,12 @@
+[legacy-callback-interface-object.html]
+  [Must be a function according to typeof]
+    expected: FAIL
+
+  [Must have the correct [[Prototype\]\]]
+    expected: FAIL
+
+  [Must have an own length property with value zero and the correct descriptors]
+    expected: FAIL
+
+  [instanceof must throw but only when we don't bail out early]
+    expected: FAIL
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/legacy-factor-function-subclass.window.js.ini b/tests/wpt/metadata/webidl/ecmascript-binding/legacy-factor-function-subclass.window.js.ini
new file mode 100644
index 00000000000..bce94513c4e
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/legacy-factor-function-subclass.window.js.ini
@@ -0,0 +1,4 @@
+[legacy-factor-function-subclass.window.html]
+  [[LegacyFactoryFunction\] can be subclassed and correctly handles NewTarget]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/legacy-platform-object/DefineOwnProperty.html.ini b/tests/wpt/metadata/webidl/ecmascript-binding/legacy-platform-object/DefineOwnProperty.html.ini
index 4515c75a2f9..4ed033b735f 100644
--- a/tests/wpt/metadata/webidl/ecmascript-binding/legacy-platform-object/DefineOwnProperty.html.ini
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/legacy-platform-object/DefineOwnProperty.html.ini
@@ -1,4 +1,4 @@
-[DefineOwnProperty.html.ini]
+[DefineOwnProperty.html]
   [Test [[DefineOwnProperty\]\] with no indexed property setter support.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/legacy-platform-object/Set.html.ini b/tests/wpt/metadata/webidl/ecmascript-binding/legacy-platform-object/Set.html.ini
index 147dbcf79a3..7dd6d3787ce 100644
--- a/tests/wpt/metadata/webidl/ecmascript-binding/legacy-platform-object/Set.html.ini
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/legacy-platform-object/Set.html.ini
@@ -1,3 +1,3 @@
-[Set.html.ini]
+[Set.html]
   [must throw when assigning to a numeric property on an object which implements a indexed property getter but not a setter in strict mode]
     expected: FAIL
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/sequence-conversion.html.ini b/tests/wpt/metadata/webidl/ecmascript-binding/sequence-conversion.html.ini
new file mode 100644
index 00000000000..059896ad46b
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/sequence-conversion.html.ini
@@ -0,0 +1,18 @@
+[sequence-conversion.html]
+  [An array]
+    expected: FAIL
+
+  [A generator]
+    expected: FAIL
+
+  [An array with an overridden Symbol.iterator]
+    expected: FAIL
+
+  [An array with an overridden Symbol.iterator on the prototype]
+    expected: FAIL
+
+  [An array with an overridden %ArrayIterator%.prototype.next]
+    expected: FAIL
+
+  [A holey array with fallback to an accessor on the prototype]
+    expected: FAIL
diff --git a/tests/wpt/metadata/webidl/ecmascript-binding/window-named-properties-object.html.ini b/tests/wpt/metadata/webidl/ecmascript-binding/window-named-properties-object.html.ini
new file mode 100644
index 00000000000..b8ca5f57086
--- /dev/null
+++ b/tests/wpt/metadata/webidl/ecmascript-binding/window-named-properties-object.html.ini
@@ -0,0 +1,30 @@
+[window-named-properties-object.html]
+  [[[GetOwnProperty\]\] (named property visibility algorithm)]
+    expected: FAIL
+
+  [[[HasProperty\]\]]
+    expected: FAIL
+
+  [[[Get\]\]]
+    expected: FAIL
+
+  [[[Set\]\] (direct)]
+    expected: FAIL
+
+  [[[Delete\]\]]
+    expected: FAIL
+
+  [[[OwnPropertyKeys\]\]]
+    expected: FAIL
+
+  [[[DefineOwnProperty\]\]]
+    expected: FAIL
+
+  [[[SetPrototypeOf\]\] and [[GetPrototypeOf\]\]]
+    expected: FAIL
+
+  [[[PreventExtensions\]\] and [[IsExtensible\]\]]
+    expected: FAIL
+  
+  [[[GetOwnProperty\]\]]
+    expected: FAIL
diff --git a/tests/wpt/metadata/websockets/Close-1000.any.js.ini b/tests/wpt/metadata/websockets/Close-1000.any.js.ini
index 6e0ddaef108..1775e8bd650 100644
--- a/tests/wpt/metadata/websockets/Close-1000.any.js.ini
+++ b/tests/wpt/metadata/websockets/Close-1000.any.js.ini
@@ -10,6 +10,7 @@
 [Close-1000.any.html]
 
 [Close-1000.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Create WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
+    expected: FAIL
 
 [Close-1000.any.worker.html?wss]
diff --git a/tests/wpt/metadata/websockets/Close-1005-verify-code.any.js.ini b/tests/wpt/metadata/websockets/Close-1005-verify-code.any.js.ini
index 5b9c724d138..d60692af877 100644
--- a/tests/wpt/metadata/websockets/Close-1005-verify-code.any.js.ini
+++ b/tests/wpt/metadata/websockets/Close-1005-verify-code.any.js.ini
@@ -1,5 +1,6 @@
 [Close-1005-verify-code.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Create WebSocket - Close the Connection - close() - return close code is 1005 - Connection should be closed]
+    expected: FAIL
 
 [Close-1005-verify-code.any.worker.html]
 
diff --git a/tests/wpt/metadata/websockets/Close-3000-reason.any.js.ini b/tests/wpt/metadata/websockets/Close-3000-reason.any.js.ini
index 3ecdd9aa36f..ca3f4e7ca28 100644
--- a/tests/wpt/metadata/websockets/Close-3000-reason.any.js.ini
+++ b/tests/wpt/metadata/websockets/Close-3000-reason.any.js.ini
@@ -12,4 +12,6 @@
 
 
 [Close-3000-reason.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Create WebSocket - Close the Connection - close(3000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/websockets/Close-delayed.any.js.ini b/tests/wpt/metadata/websockets/Close-delayed.any.js.ini
index 3a9e86ae62b..04b24f518d8 100644
--- a/tests/wpt/metadata/websockets/Close-delayed.any.js.ini
+++ b/tests/wpt/metadata/websockets/Close-delayed.any.js.ini
@@ -8,7 +8,8 @@
 [Close-delayed.any.worker.html?wss]
 
 [Close-delayed.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Create WebSocket - Close the Connection - close should not emit until handshake completes - Connection should be closed]
+    expected: FAIL
 
 [Close-delayed.any.worker.html]
 
diff --git a/tests/wpt/metadata/websockets/Close-readyState-Closing.any.js.ini b/tests/wpt/metadata/websockets/Close-readyState-Closing.any.js.ini
index 7fbcdb323ab..ac4c249be51 100644
--- a/tests/wpt/metadata/websockets/Close-readyState-Closing.any.js.ini
+++ b/tests/wpt/metadata/websockets/Close-readyState-Closing.any.js.ini
@@ -3,7 +3,8 @@
 [Close-readyState-Closing.any.html?wss]
 
 [Close-readyState-Closing.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Create WebSocket - Close the Connection - readyState should be in CLOSING state just before onclose is called]
+    expected: FAIL
 
 [Close-readyState-Closing.any.html]
 
diff --git a/tests/wpt/metadata/websockets/Close-server-initiated-close.any.js.ini b/tests/wpt/metadata/websockets/Close-server-initiated-close.any.js.ini
index 1f2af8fa77c..fd6745a270e 100644
--- a/tests/wpt/metadata/websockets/Close-server-initiated-close.any.js.ini
+++ b/tests/wpt/metadata/websockets/Close-server-initiated-close.any.js.ini
@@ -8,7 +8,8 @@
 
 
 [Close-server-initiated-close.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Create WebSocket - Server initiated Close - Client sends back a CLOSE - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed]
+    expected: FAIL
 
 [Close-server-initiated-close.any.html?wss]
 
diff --git a/tests/wpt/metadata/websockets/Close-undefined.any.js.ini b/tests/wpt/metadata/websockets/Close-undefined.any.js.ini
index 79408ff98dd..f94f5c38bc9 100644
--- a/tests/wpt/metadata/websockets/Close-undefined.any.js.ini
+++ b/tests/wpt/metadata/websockets/Close-undefined.any.js.ini
@@ -1,7 +1,8 @@
 [Close-undefined.any.html?wss]
 
 [Close-undefined.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Close-undefined]
+    expected: FAIL
 
 [Close-undefined.any.worker.html?wpt_flags=h2]
   [Close-undefined]
diff --git a/tests/wpt/metadata/websockets/Create-invalid-urls.any.js.ini b/tests/wpt/metadata/websockets/Create-invalid-urls.any.js.ini
index 347e62a6141..911a05c7d18 100644
--- a/tests/wpt/metadata/websockets/Create-invalid-urls.any.js.ini
+++ b/tests/wpt/metadata/websockets/Create-invalid-urls.any.js.ini
@@ -5,7 +5,6 @@
 [Create-invalid-urls.any.worker.html?wss]
 
 [Create-invalid-urls.any.html?wpt_flags=h2]
-  expected: TIMEOUT
 
 [Create-invalid-urls.any.worker.html?wpt_flags=h2]
 
diff --git a/tests/wpt/metadata/websockets/Create-protocols-repeated-case-insensitive.any.js.ini b/tests/wpt/metadata/websockets/Create-protocols-repeated-case-insensitive.any.js.ini
index fd868c873d7..c52951ed028 100644
--- a/tests/wpt/metadata/websockets/Create-protocols-repeated-case-insensitive.any.js.ini
+++ b/tests/wpt/metadata/websockets/Create-protocols-repeated-case-insensitive.any.js.ini
@@ -9,4 +9,3 @@
 [Create-protocols-repeated-case-insensitive.any.html]
 
 [Create-protocols-repeated-case-insensitive.any.html?wpt_flags=h2]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/websockets/Create-url-with-space.any.js.ini b/tests/wpt/metadata/websockets/Create-url-with-space.any.js.ini
index fdee9802f4f..8e4f3b1bd4f 100644
--- a/tests/wpt/metadata/websockets/Create-url-with-space.any.js.ini
+++ b/tests/wpt/metadata/websockets/Create-url-with-space.any.js.ini
@@ -1,7 +1,6 @@
 [Create-url-with-space.any.worker.html]
 
 [Create-url-with-space.any.worker.html?wpt_flags=h2]
-  expected: TIMEOUT
 
 [Create-url-with-space.any.html?wss]
 
diff --git a/tests/wpt/metadata/websockets/Create-valid-url-array-protocols.any.js.ini b/tests/wpt/metadata/websockets/Create-valid-url-array-protocols.any.js.ini
index 6a3ea1224c5..1729572ffc6 100644
--- a/tests/wpt/metadata/websockets/Create-valid-url-array-protocols.any.js.ini
+++ b/tests/wpt/metadata/websockets/Create-valid-url-array-protocols.any.js.ini
@@ -12,4 +12,5 @@
 [Create-valid-url-array-protocols.any.html]
 
 [Create-valid-url-array-protocols.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Create WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed]
+    expected: FAIL
diff --git a/tests/wpt/metadata/websockets/Create-valid-url-protocol-empty.any.js.ini b/tests/wpt/metadata/websockets/Create-valid-url-protocol-empty.any.js.ini
index 79bd0ee1446..f5e9a9bf55e 100644
--- a/tests/wpt/metadata/websockets/Create-valid-url-protocol-empty.any.js.ini
+++ b/tests/wpt/metadata/websockets/Create-valid-url-protocol-empty.any.js.ini
@@ -1,5 +1,4 @@
 [Create-valid-url-protocol-empty.any.html?wpt_flags=h2]
-  expected: TIMEOUT
 
 [Create-valid-url-protocol-empty.any.html?wss]
 
diff --git a/tests/wpt/metadata/websockets/Create-valid-url-protocol.any.js.ini b/tests/wpt/metadata/websockets/Create-valid-url-protocol.any.js.ini
index 7cc0ca1b1e3..1354a97e76d 100644
--- a/tests/wpt/metadata/websockets/Create-valid-url-protocol.any.js.ini
+++ b/tests/wpt/metadata/websockets/Create-valid-url-protocol.any.js.ini
@@ -12,4 +12,5 @@
 [Create-valid-url-protocol.any.html]
 
 [Create-valid-url-protocol.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Create WebSocket - Pass a valid URL and a protocol string - Connection should be closed]
+    expected: FAIL
diff --git a/tests/wpt/metadata/websockets/Create-wrong-scheme.any.js.ini b/tests/wpt/metadata/websockets/Create-wrong-scheme.any.js.ini
index c40a1fbd928..2ddc8cbb3a0 100644
--- a/tests/wpt/metadata/websockets/Create-wrong-scheme.any.js.ini
+++ b/tests/wpt/metadata/websockets/Create-wrong-scheme.any.js.ini
@@ -3,7 +3,6 @@
 [Create-wrong-scheme.any.worker.html]
 
 [Create-wrong-scheme.any.html?wpt_flags=h2]
-  expected: TIMEOUT
 
 [Create-wrong-scheme.any.html?wss]
 
diff --git a/tests/wpt/metadata/websockets/Send-before-open.any.js.ini b/tests/wpt/metadata/websockets/Send-before-open.any.js.ini
index dd65156557a..b93aa4313bd 100644
--- a/tests/wpt/metadata/websockets/Send-before-open.any.js.ini
+++ b/tests/wpt/metadata/websockets/Send-before-open.any.js.ini
@@ -3,7 +3,6 @@
 [Send-before-open.any.worker.html]
 
 [Send-before-open.any.html?wpt_flags=h2]
-  expected: TIMEOUT
 
 [Send-before-open.any.html?wss]
 
diff --git a/tests/wpt/metadata/websockets/Send-binary-arraybufferview-float64.any.js.ini b/tests/wpt/metadata/websockets/Send-binary-arraybufferview-float64.any.js.ini
index f1dcaac7f57..0842221ad1b 100644
--- a/tests/wpt/metadata/websockets/Send-binary-arraybufferview-float64.any.js.ini
+++ b/tests/wpt/metadata/websockets/Send-binary-arraybufferview-float64.any.js.ini
@@ -12,4 +12,5 @@
 [Send-binary-arraybufferview-float64.any.html]
 
 [Send-binary-arraybufferview-float64.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be closed]
+    expected: FAIL
diff --git a/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int16-offset.any.js.ini b/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int16-offset.any.js.ini
index 62c4b9d6a0e..b4dfda6b587 100644
--- a/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int16-offset.any.js.ini
+++ b/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int16-offset.any.js.ini
@@ -3,7 +3,8 @@
 [Send-binary-arraybufferview-int16-offset.any.worker.html]
 
 [Send-binary-arraybufferview-int16-offset.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Connection should be closed]
+    expected: FAIL
 
 [Send-binary-arraybufferview-int16-offset.any.worker.html?wss]
 
diff --git a/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int8.any.js.ini b/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int8.any.js.ini
index 11a4f5cc553..197426abd6f 100644
--- a/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int8.any.js.ini
+++ b/tests/wpt/metadata/websockets/Send-binary-arraybufferview-int8.any.js.ini
@@ -10,6 +10,7 @@
 
 
 [Send-binary-arraybufferview-int8.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Send binary data on a WebSocket - ArrayBufferView - Int8Array - Connection should be closed]
+    expected: FAIL
 
 [Send-binary-arraybufferview-int8.any.worker.html?wss]
diff --git a/tests/wpt/metadata/websockets/Send-data.any.js.ini b/tests/wpt/metadata/websockets/Send-data.any.js.ini
index e1c5d310ae1..a1297e9989c 100644
--- a/tests/wpt/metadata/websockets/Send-data.any.js.ini
+++ b/tests/wpt/metadata/websockets/Send-data.any.js.ini
@@ -1,5 +1,6 @@
 [Send-data.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Send data on a WebSocket - Connection should be closed]
+    expected: FAIL
 
 [Send-data.any.worker.html?wss]
 
diff --git a/tests/wpt/metadata/websockets/Send-paired-surrogates.any.js.ini b/tests/wpt/metadata/websockets/Send-paired-surrogates.any.js.ini
index 3668269d36f..32ee68aeffe 100644
--- a/tests/wpt/metadata/websockets/Send-paired-surrogates.any.js.ini
+++ b/tests/wpt/metadata/websockets/Send-paired-surrogates.any.js.ini
@@ -5,7 +5,8 @@
 [Send-paired-surrogates.any.worker.html]
 
 [Send-paired-surrogates.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Send paired surrogates data on a WebSocket - Connection should be closed]
+    expected: FAIL
 
 [Send-paired-surrogates.any.worker.html?wpt_flags=h2]
   [Send paired surrogates data on a WebSocket - Connection should be closed]
diff --git a/tests/wpt/metadata/websockets/Send-unicode-data.any.js.ini b/tests/wpt/metadata/websockets/Send-unicode-data.any.js.ini
index c0c66039e99..609dbc8b019 100644
--- a/tests/wpt/metadata/websockets/Send-unicode-data.any.js.ini
+++ b/tests/wpt/metadata/websockets/Send-unicode-data.any.js.ini
@@ -6,7 +6,8 @@
 [Send-unicode-data.any.html]
 
 [Send-unicode-data.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [Send unicode data on a WebSocket - Connection should be closed]
+    expected: FAIL
 
 [Send-unicode-data.any.worker.html?wss]
 
diff --git a/tests/wpt/metadata/websockets/stream/tentative/abort.any.js.ini b/tests/wpt/metadata/websockets/stream/tentative/abort.any.js.ini
index ee47c3a25a4..f9c25355b1a 100644
--- a/tests/wpt/metadata/websockets/stream/tentative/abort.any.js.ini
+++ b/tests/wpt/metadata/websockets/stream/tentative/abort.any.js.ini
@@ -61,7 +61,14 @@
   expected: ERROR
 
 [abort.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [abort before constructing should prevent connection]
+    expected: FAIL
+
+  [abort during handshake should work]
+    expected: FAIL
+
+  [abort after connect should do nothing]
+    expected: FAIL
 
 [abort.any.worker.html?wpt_flags=h2]
   [abort before constructing should prevent connection]
diff --git a/tests/wpt/metadata/websockets/stream/tentative/backpressure-receive.any.js.ini b/tests/wpt/metadata/websockets/stream/tentative/backpressure-receive.any.js.ini
index d57fd86b138..6cd3856e652 100644
--- a/tests/wpt/metadata/websockets/stream/tentative/backpressure-receive.any.js.ini
+++ b/tests/wpt/metadata/websockets/stream/tentative/backpressure-receive.any.js.ini
@@ -34,7 +34,8 @@
   expected: ERROR
 
 [backpressure-receive.any.html?wpt_flags=h2]
-  expected: TIMEOUT
+  [backpressure should be applied to received messages]
+    expected: FAIL
 
 [backpressure-receive.any.html?wss]
   [backpressure should be applied to received messages]