diff --git a/src/test/wpt/metadata/XMLHttpRequest/data-uri-basic.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/data-uri-basic.htm.ini
index 2df0d2e6784..cb0a5d97ccf 100644
--- a/src/test/wpt/metadata/XMLHttpRequest/data-uri-basic.htm.ini
+++ b/src/test/wpt/metadata/XMLHttpRequest/data-uri-basic.htm.ini
@@ -1,20 +1,30 @@
 [data-uri-basic.htm]
   type: testharness
+  expected: TIMEOUT
   [GET responseText]
-    expected: FAIL
+    expected: TIMEOUT
 
   [GET Content-Type]
-    expected: FAIL
+    expected: TIMEOUT
 
   [GET Content-Type with param]
-    expected: FAIL
+    expected: TIMEOUT
 
   [GET getAllResponseHeaders]
-    expected: FAIL
+    expected: TIMEOUT
 
   [POST responseText]
-    expected: FAIL
+    expected: TIMEOUT
 
   [POST status]
-    expected: FAIL
+    expected: TIMEOUT
+
+  [GET responseText base64]
+    expected: TIMEOUT
+
+  [GET status]
+    expected: TIMEOUT
+
+  [GET statusText]
+    expected: TIMEOUT
 
diff --git a/src/test/wpt/metadata/XMLHttpRequest/data-uri.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/data-uri.htm.ini
index 3e57540eec4..e24899c3c18 100644
--- a/src/test/wpt/metadata/XMLHttpRequest/data-uri.htm.ini
+++ b/src/test/wpt/metadata/XMLHttpRequest/data-uri.htm.ini
@@ -1,29 +1,30 @@
 [data-uri.htm]
   type: testharness
+  expected: TIMEOUT
   [XHR method GET with charset text/plain]
-    expected: FAIL
+    expected: TIMEOUT
 
   [XHR method GET with charset text/plain (base64)]
-    expected: FAIL
+    expected: TIMEOUT
 
   [XHR method GET with charset text/html]
-    expected: FAIL
+    expected: TIMEOUT
 
   [XHR method GET with charset image/png]
-    expected: FAIL
+    expected: TIMEOUT
 
   [XHR method POST with charset text/plain]
-    expected: FAIL
+    expected: TIMEOUT
 
   [XHR method PUT with charset text/plain]
-    expected: FAIL
+    expected: TIMEOUT
 
   [XHR method DELETE with charset text/plain]
-    expected: FAIL
+    expected: TIMEOUT
 
   [XHR method HEAD with charset text/plain]
-    expected: FAIL
+    expected: TIMEOUT
 
   [XHR method UNICORN with charset text/plain]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/src/test/wpt/metadata/XMLHttpRequest/open-referer.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/open-referer.htm.ini
new file mode 100644
index 00000000000..61d869b94be
--- /dev/null
+++ b/src/test/wpt/metadata/XMLHttpRequest/open-referer.htm.ini
@@ -0,0 +1,5 @@
+[open-referer.htm]
+  type: testharness
+  [XMLHttpRequest: open() - value of Referer header]
+    expected: FAIL
+
diff --git a/src/test/wpt/metadata/XMLHttpRequest/open-url-about-blank-window.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/open-url-about-blank-window.htm.ini
index 8db7677a91b..da6e5e64ff5 100644
--- a/src/test/wpt/metadata/XMLHttpRequest/open-url-about-blank-window.htm.ini
+++ b/src/test/wpt/metadata/XMLHttpRequest/open-url-about-blank-window.htm.ini
@@ -1,5 +1,3 @@
 [open-url-about-blank-window.htm]
   type: testharness
-  [XMLHttpRequest: open() resolving URLs (about:blank iframe)]
-    expected: FAIL
-
+  expected: TIMEOUT
diff --git a/src/test/wpt/metadata/XMLHttpRequest/open-url-fragment.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/open-url-fragment.htm.ini
deleted file mode 100644
index f33b9db80eb..00000000000
--- a/src/test/wpt/metadata/XMLHttpRequest/open-url-fragment.htm.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[open-url-fragment.htm]
-  type: testharness
-  [make sure escaped # is not removed]
-    expected: FAIL
-
diff --git a/src/test/wpt/metadata/XMLHttpRequest/responsetext-decoding.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/responsetext-decoding.htm.ini
index 80d6b20b058..32de679a16a 100644
--- a/src/test/wpt/metadata/XMLHttpRequest/responsetext-decoding.htm.ini
+++ b/src/test/wpt/metadata/XMLHttpRequest/responsetext-decoding.htm.ini
@@ -1,11 +1,5 @@
 [responsetext-decoding.htm]
   type: testharness
-  [XMLHttpRequest: responseText decoding (text/plain;charset=windows-1252 %FF)]
-    expected: FAIL
-
-  [XMLHttpRequest: responseText decoding (text/plain %FF)]
-    expected: FAIL
-
   [XMLHttpRequest: responseText decoding (text/plain %FE%FF)]
     expected: FAIL
 
@@ -18,9 +12,6 @@
   [XMLHttpRequest: responseText decoding (text/plain %EF%BB%BF%EF%BB%BF)]
     expected: FAIL
 
-  [XMLHttpRequest: responseText decoding (text/plain %C2)]
-    expected: FAIL
-
   [XMLHttpRequest: responseText decoding (text/xml %FE%FF)]
     expected: FAIL
 
@@ -33,9 +24,9 @@
   [XMLHttpRequest: responseText decoding (text/xml %EF%BB%BF%EF%BB%BF)]
     expected: FAIL
 
-  [XMLHttpRequest: responseText decoding (text/plain %E3%81%B2)]
+  [XMLHttpRequest: responseText decoding (application/xml %3C%3Fxml%20version%3D\'1.0\'%20encoding%3D\'windows-1252\'%3F%3E%3Cx%3E%FF%3C%2Fx%3E)]
     expected: FAIL
 
-  [XMLHttpRequest: responseText decoding (text/xml %3C%3Fxml%20version%3D\'1.0\'%20encoding%3D\'windows-1252\'%3F%3E%3Cx%3E%E3%81%B2%3C%2Fx%3E)]
+  [XMLHttpRequest: responseText decoding (text/html %3C!doctype%20html%3E%3Cmeta%20charset%3Dwindows-1252%3E%FF)]
     expected: FAIL
 
diff --git a/src/test/wpt/metadata/XMLHttpRequest/send-network-error-async-events.sub.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/send-network-error-async-events.sub.htm.ini
index 86526658f7e..023a121a237 100644
--- a/src/test/wpt/metadata/XMLHttpRequest/send-network-error-async-events.sub.htm.ini
+++ b/src/test/wpt/metadata/XMLHttpRequest/send-network-error-async-events.sub.htm.ini
@@ -1,5 +1,6 @@
 [send-network-error-async-events.sub.htm]
   type: testharness
+  expected: TIMEOUT
   [XmlHttpRequest: The send() method: Fire a progress event named error when Network error happens (synchronous flag is unset)]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/src/test/wpt/metadata/XMLHttpRequest/send-redirect-infinite-sync.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/send-redirect-infinite-sync.htm.ini
new file mode 100644
index 00000000000..db80e8369c0
--- /dev/null
+++ b/src/test/wpt/metadata/XMLHttpRequest/send-redirect-infinite-sync.htm.ini
@@ -0,0 +1,5 @@
+[send-redirect-infinite-sync.htm]
+  type: testharness
+  [XMLHttpRequest: send() - Redirects (infinite loop; sync) (301)]
+    expected: FAIL
+
diff --git a/src/test/wpt/metadata/XMLHttpRequest/send-redirect-infinite.htm.ini b/src/test/wpt/metadata/XMLHttpRequest/send-redirect-infinite.htm.ini
new file mode 100644
index 00000000000..fa053ae4846
--- /dev/null
+++ b/src/test/wpt/metadata/XMLHttpRequest/send-redirect-infinite.htm.ini
@@ -0,0 +1,5 @@
+[send-redirect-infinite.htm]
+  type: testharness
+  [XMLHttpRequest: send() - Redirects (infinite loop)]
+    expected: FAIL
+
diff --git a/src/test/wpt/metadata/dom/errors/exceptions.html.ini b/src/test/wpt/metadata/dom/errors/exceptions.html.ini
index cba79be74fd..7a1fe4d6a48 100644
--- a/src/test/wpt/metadata/dom/errors/exceptions.html.ini
+++ b/src/test/wpt/metadata/dom/errors/exceptions.html.ini
@@ -1,9 +1,3 @@
 [exceptions.html]
   type: testharness
   expected: TIMEOUT
-  [exception.hasOwnProperty("message")]
-    expected: FAIL
-
-  [Object.getOwnPropertyDescriptor(exception, "message")]
-    expected: FAIL
-
diff --git a/src/test/wpt/metadata/dom/events/Event-constants.html.ini b/src/test/wpt/metadata/dom/events/Event-constants.html.ini
deleted file mode 100644
index 5ec729ac6fc..00000000000
--- a/src/test/wpt/metadata/dom/events/Event-constants.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Event-constants.html]
-  type: testharness
-  expected: TIMEOUT
diff --git a/src/test/wpt/metadata/dom/nodes/Node-appendChild.html.ini b/src/test/wpt/metadata/dom/nodes/Node-appendChild.html.ini
index e94b08a528d..4b30c987166 100644
--- a/src/test/wpt/metadata/dom/nodes/Node-appendChild.html.ini
+++ b/src/test/wpt/metadata/dom/nodes/Node-appendChild.html.ini
@@ -1,6 +1,3 @@
 [Node-appendChild.html]
   type: testharness
   expected: TIMEOUT
-  [WebIDL tests]
-    expected: TIMEOUT
-
diff --git a/src/test/wpt/metadata/dom/nodes/Node-compareDocumentPosition.html.ini b/src/test/wpt/metadata/dom/nodes/Node-compareDocumentPosition.html.ini
index 1bfdafdd88a..4ac55146b46 100644
--- a/src/test/wpt/metadata/dom/nodes/Node-compareDocumentPosition.html.ini
+++ b/src/test/wpt/metadata/dom/nodes/Node-compareDocumentPosition.html.ini
@@ -1,3 +1,3 @@
 [Node-compareDocumentPosition.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/src/test/wpt/metadata/dom/nodes/Node-constants.html.ini b/src/test/wpt/metadata/dom/nodes/Node-constants.html.ini
deleted file mode 100644
index b0db1a5ee76..00000000000
--- a/src/test/wpt/metadata/dom/nodes/Node-constants.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[Node-constants.html]
-  type: testharness
-  expected: TIMEOUT
diff --git a/src/test/wpt/metadata/dom/nodes/Node-contains.html.ini b/src/test/wpt/metadata/dom/nodes/Node-contains.html.ini
index a3db08a7da2..dad38c8164d 100644
--- a/src/test/wpt/metadata/dom/nodes/Node-contains.html.ini
+++ b/src/test/wpt/metadata/dom/nodes/Node-contains.html.ini
@@ -1,3 +1,3 @@
 [Node-contains.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
diff --git a/src/test/wpt/metadata/dom/nodes/Node-properties.html.ini b/src/test/wpt/metadata/dom/nodes/Node-properties.html.ini
index 5f89e70f4a0..f85f1dfd763 100644
--- a/src/test/wpt/metadata/dom/nodes/Node-properties.html.ini
+++ b/src/test/wpt/metadata/dom/nodes/Node-properties.html.ini
@@ -1,3 +1,3 @@
 [Node-properties.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR