diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index e181af5397f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementsFromPoint-invalid-cases.html]
-  [The root element is the last element returned for otherwise empty queries within the viewport]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 6f8d73a891b..25d4f2b1265 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -309,21 +309,15 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 9383f8004c1..30e1b851fd4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,9 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 338d283eb0e..295031c1812 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 9eb581fcf1f..0218bc9ba9d 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index b8aea774f46..85d9f9bff2a 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -5,51 +5,24 @@
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
@@ -59,21 +32,42 @@
   [input type tel: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionStart a second time (must not fire select)]
     expected: FAIL
 
+  [input type password: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index dbec6f2c2ff..5602ea31dbe 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,3 +3,6 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
+  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index 5ddb9bfeff6..a1effd5f801 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,10 +1,9 @@
 [promise-job-entry.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -16,5 +15,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index bf727e1df7a..63e32fce73f 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -545,3 +545,6 @@
   [X SNR (-529.2379582870841 dB) is not greater than or equal to 65.737. Got -529.2379582870841.]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t1.9545141262291947e-15\t9.3139332532882690e-1\t9.3139332532882491e-1\t9.9999999999999789e-1\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882491e-1 at index of 28696.\n\tMax RelError of 9.9999999999999789e-1 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index b6357d28de2..59106abffe4 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -11002,13 +11002,6 @@
        {}
       ]
      ],
-     "active-selection-003-manual.html": [
-      "c56a301ef3a475530cce9b4b01a008577f6bd88a",
-      [
-       null,
-       {}
-      ]
-     ],
      "active-selection-004-manual.html": [
       "ac7ba7da327df4705c3b71bdebcbb9cc08a4c5ae",
       [
@@ -252963,6 +252956,32 @@
       {}
      ]
     ],
+    "line-height-limited-quirks-mode.html": [
+     "db0c3fa2b4354282d69e2e7e3497d5c153fca5ee",
+     [
+      null,
+      [
+       [
+        "/quirks/line-height-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
+    "line-height-quirks-mode.html": [
+     "9e9baf62226dfccc15f81b6d22edb87a29e2d313",
+     [
+      null,
+      [
+       [
+        "/quirks/line-height-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
     "line-height-trailing-collapsable-whitespace.html": [
      "00a9ca276b5fbc8cffee094924d4991df8ef40e7",
      [
@@ -318908,14 +318927,6 @@
        "823f125b8e4a60f780f00443c9c9a10b9fa1f447",
        []
       ],
-      "select-custom.cur": [
-       "0a1f5dd51458223ce9213487ebcea627cdf75a4d",
-       []
-      ],
-      "select-custom.png": [
-       "344aacee6afe29536d1263a3a24cb47a7f7b8786",
-       []
-      ],
       "selections.js": [
        "022528e6aaa7c0cf708b6b922e7d15b4d0cbf1a8",
        []
@@ -356922,6 +356933,10 @@
      "2d93fff41721d5a6d2fa43ad9b819cd86ebf3c95",
      []
     ],
+    "line-height-ref.html": [
+     "a5c92e732d38b8031de4e33c6cb97bd8214c945a",
+     []
+    ],
     "line-height-trailing-collapsable-whitespace-ref.html": [
      "92c3b3c3ca0cd3eb019f72942eb8218b8dc9b4da",
      []
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index e181af5397f..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementsFromPoint-invalid-cases.html]
-  [The root element is the last element returned for otherwise empty queries within the viewport]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index d758970c8ba..ae266990efc 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,21 +309,15 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 9383f8004c1..30e1b851fd4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,9 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%22nosniFF%22]
-    expected: FAIL
-
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306..5f60c78e73c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 45d8be1c898..3a32693ffa8 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index b8aea774f46..85d9f9bff2a 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -5,51 +5,24 @@
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionEnd a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
@@ -59,21 +32,42 @@
   [input type tel: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type text: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [textarea: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionStart a second time (must not fire select)]
     expected: FAIL
 
+  [input type password: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange out of range a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 0cef5158fae..edae5e5adcd 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,3 +4,6 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
+  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
index 5ddb9bfeff6..a1effd5f801 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/processing-model-2/integration-with-the-javascript-job-queue/promise-job-entry.html.ini
@@ -1,10 +1,9 @@
 [promise-job-entry.html]
-  expected: TIMEOUT
   [Fulfillment handler on fulfilled promise]
     expected: FAIL
 
   [Rejection handler on pending-then-rejected promise]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Sanity check: this all works as expected with no promises involved]
     expected: FAIL
@@ -16,5 +15,5 @@
     expected: FAIL
 
   [Fulfillment handler on pending-then-fulfilled promise]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index a63939b8ee9..4ea3ff94677 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -773,3 +773,6 @@
   [X SNR (-529.2379582870841 dB) is not greater than or equal to 65.737. Got -529.2379582870841.]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t1.9545141262291947e-15\t9.3139332532882690e-1\t9.3139332532882491e-1\t9.9999999999999789e-1\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882491e-1 at index of 28696.\n\tMax RelError of 9.9999999999999789e-1 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/without-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-003-manual.html b/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-003-manual.html
deleted file mode 100644
index c56a301ef3a..00000000000
--- a/tests/wpt/web-platform-tests/css/css-pseudo/active-selection-003-manual.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-
-  <meta charset="UTF-8">
-
-  <title>CSS Pseudo-Elements Test: active selection and cursor (basic)</title>
-
-  <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/">
-  <link rel="help" href="https://www.w3.org/TR/css-pseudo-4/#highlight-selectors">
-  <link rel="help" href="https://www.w3.org/TR/css-pseudo-4/#highlight-styling">
-
-  <meta content="interact should" name="flags">
-
-  <style>
-  div
-    {
-      cursor: auto;
-      font-size: 300%;
-    }
-
-  div::selection
-    {
-      cursor: url("support/select-custom.cur"), help;
-    }
-
-  img
-    {
-      vertical-align: -1em;
-    }
-  </style>
-
-  <p>Instructions: Select a few or all characters from the words "Text sample" using a variety of methods:
-
-  <ul>
-    <li>Select by dragging (leftwardedly or rightwardedly) the mouse across the characters.
-    <li>Select by using shift + keyboard arrows when keyboard navigation / caret browsing is enabled.
-    <li>Double click a word to select it.
-    <li>Triple click the text to select it.
-  </ul>
-
-  <p>Test passes if, in every case, the cursor becomes <img src="support/select-custom.png" width="32" height="32" alt="Image download support must be enabled"> when hovering anywhere over the selection of "Text sample" <em>and</em> if the background color and color of the selected text are the same as when selecting text from these instructions.
-
-  <div>Text sample</div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/support/select-custom.cur b/tests/wpt/web-platform-tests/css/css-pseudo/support/select-custom.cur
deleted file mode 100644
index 0a1f5dd5145..00000000000
Binary files a/tests/wpt/web-platform-tests/css/css-pseudo/support/select-custom.cur and /dev/null differ
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/support/select-custom.png b/tests/wpt/web-platform-tests/css/css-pseudo/support/select-custom.png
deleted file mode 100644
index 344aacee6af..00000000000
Binary files a/tests/wpt/web-platform-tests/css/css-pseudo/support/select-custom.png and /dev/null differ
diff --git a/tests/wpt/web-platform-tests/quirks/line-height-limited-quirks-mode.html b/tests/wpt/web-platform-tests/quirks/line-height-limited-quirks-mode.html
new file mode 100644
index 00000000000..db0c3fa2b43
--- /dev/null
+++ b/tests/wpt/web-platform-tests/quirks/line-height-limited-quirks-mode.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+  <link rel="help" href="https://quirks.spec.whatwg.org/#the-line-height-calculation-quirk">
+  <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1686326">
+  <link rel="match" href="line-height-ref.html">
+  <meta name="assert" content="The test passes if the blue box has no scrollbar and you see the word PASS">
+<style>
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+.wrapper {
+  overflow: auto;
+  border: solid blue;
+}
+</style>
+</head>
+<body>
+  <div class="wrapper">
+    <div style="border:50px solid lightgrey"></div>
+    <span style="margin-top: -100px; display: inline-block">PASS</span>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/quirks/line-height-quirks-mode.html b/tests/wpt/web-platform-tests/quirks/line-height-quirks-mode.html
new file mode 100644
index 00000000000..9e9baf62226
--- /dev/null
+++ b/tests/wpt/web-platform-tests/quirks/line-height-quirks-mode.html
@@ -0,0 +1,26 @@
+<!-- quirks mode -->
+<html>
+<head>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+  <link rel="help" href="https://quirks.spec.whatwg.org/#the-line-height-calculation-quirk">
+  <link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1686326">
+  <link rel="match" href="line-height-ref.html">
+  <meta name="assert" content="The test passes if the blue box has no scrollbar and you see the word PASS">
+<style>
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+.wrapper {
+  overflow: auto;
+  border: solid blue;
+}
+</style>
+</head>
+<body>
+  <div class="wrapper">
+    <div style="border:50px solid lightgrey"></div>
+    <span style="margin-top: -100px; display: inline-block">PASS</span>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/quirks/line-height-ref.html b/tests/wpt/web-platform-tests/quirks/line-height-ref.html
new file mode 100644
index 00000000000..a5c92e732d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/quirks/line-height-ref.html
@@ -0,0 +1,22 @@
+<!-- quirks mode -->
+<html>
+<head>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+<style>
+html,body {
+  color:black; background-color:white; font:20px/1 monospace; padding:0; margin:0;
+}
+
+.wrapper {
+  overflow: hidden;
+  border: solid blue;
+}
+</style>
+</head>
+<body>
+  <div class="wrapper">
+    <div style="border:50px solid lightgrey"></div>
+    <span style="margin-top: -100px; display: inline-block">PASS</span>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
index a83e0a1c842..8e56bf6514b 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
@@ -284,3 +284,12 @@
   [WebGL test #46: attachment 1 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,0,0,255]
     expected: FAIL
 
+  [WebGL test #49: attachment 4 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,255,0,0]
+    expected: FAIL
+
+  [WebGL test #44: attachment 7 should be 0,255,0,255\nat (4, 0) expected: 0,255,0,255 was 0,255,0,0]
+    expected: FAIL
+
+  [WebGL test #41: attachment 4 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,255,0,0]
+    expected: FAIL
+