diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index a9e46713244..76b398963ae 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: FAIL
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 6b57417e226..1e7fbf4dab8 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -326089,6 +326089,12 @@
      {}
     ]
    ],
+   "css/css-overflow/scroll-overflow-padding-block-001.html": [
+    [
+     "css/css-overflow/scroll-overflow-padding-block-001.html",
+     {}
+    ]
+   ],
    "css/css-overscroll-behavior/inheritance.html": [
     [
      "css/css-overscroll-behavior/inheritance.html",
@@ -586672,6 +586678,10 @@
    "8f5b1ef53eb72dd82f1211744a21c34dede17b46",
    "support"
   ],
+  "css/css-overflow/scroll-overflow-padding-block-001.html": [
+   "13df853ab3462dff7db84d6558d4b941bf83995d",
+   "testharness"
+  ],
   "css/css-overflow/shrink-to-fit-auto-overflow-relayout-crash.html": [
    "c0f0214ee186a0b13787f6f86bd199e7d6df7ac0",
    "crashtest"
@@ -668549,11 +668559,11 @@
    "testharness"
   ],
   "loading/lazyload/invisible-image.tentative.html": [
-   "b70889b08191e851bb5a2ff4ab8c895df9648433",
+   "b8b945ee01e9c36b665b8358264f4e872204a7f0",
    "testharness"
   ],
   "loading/lazyload/invisible-lazy-image.tentative.html": [
-   "3a8e259187663726b05bac34089d7cbf4368aa6a",
+   "805d614e401670a5d73199a6771a028a7e41d7d6",
    "testharness"
   ],
   "loading/lazyload/original-base-url-applied-tentative.html": [
diff --git a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
index 70a00a101f6..e35a452a186 100644
--- a/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/no-transition-from-ua-to-blocking-stylesheet.html.ini
@@ -1,2 +1,2 @@
 [no-transition-from-ua-to-blocking-stylesheet.html]
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini b/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
index c884dc82eab..628b1fab770 100644
--- a/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
@@ -2,6 +2,3 @@
   [listeners are called when <iframe> is resized]
     expected: FAIL
 
-  [listeners are called correct number of times]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
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 a5264c1cebc..254d9678e47 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,24 +309,9 @@
   [<iframe>: separate response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate 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 */*]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 2d5faa72ac7..d2df9b78483 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,6 +53,6 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
+  [separate text/javascript x/x]
     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 e1053e48ee8..cea868999e8 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,8 +11,9 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
-    expected: FAIL
-
   [Content-Type-Options%3A%20nosniff]
     expected: FAIL
+
+  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
index 62068b05a2f..6bd06899fdd 100644
--- a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
@@ -13,3 +13,9 @@
   [Embedded credentials matching the top-level are treated as network errors for cross-origin URLs.]
     expected: TIMEOUT
 
+  [Embedded credentials matching the top-level are not treated as network errors for same-origin URLs.]
+    expected: TIMEOUT
+
+  [Embedded credentials matching the top-level are not treated as network errors for relative URLs.]
+    expected: TIMEOUT
+
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/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index f69edc0bd37..ced66541669 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -6,3 +6,15 @@
   [Set HTTP URL frame location.protocol to gopher]
     expected: FAIL
 
+  [Set HTTP URL frame location.protocol to data]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to x]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to http+x]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to ftp]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
new file mode 100644
index 00000000000..16fa2c5cfc1
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/creating_browsing_context_test_01.html.ini
@@ -0,0 +1,4 @@
+[creating_browsing_context_test_01.html]
+  [first argument: absolute url]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini
deleted file mode 100644
index 5105aa291b2..00000000000
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-another-top-level-browsing-context.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[skip-another-top-level-browsing-context.html]
-  expected: TIMEOUT
-  [Autofocus elements queued in another top-level browsing context's documents should be skipped.]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-document-with-fragment.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-document-with-fragment.html.ini
index c12c0f8ae48..6852d7663de 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-document-with-fragment.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/skip-document-with-fragment.html.ini
@@ -1,4 +1,8 @@
 [skip-document-with-fragment.html]
+  expected: TIMEOUT
   [Autofocus elements in iframed documents with URL fragments should be skipped.]
     expected: FAIL
 
+  [Autofocus elements in top-level browsing context's documents with URI fragments should be skipped.]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index dc856a3d5a3..2568040e6e5 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
index f6eecd82b49..61799e4c935 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
@@ -1,5 +1,5 @@
 [form-double-submit-2.html]
   expected: ERROR
   [preventDefault should allow onclick submit() to succeed]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index daa264ed535..65424f7891a 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,18 +1,18 @@
 [htmlanchorelement_noopener.html]
   type: testharness
-  expected: TIMEOUT
+  expected: ERROR
   [Check that targeting of rel=noopener with a given name ignores an existing window with that name]
     expected: NOTRUN
 
   [Check that rel=noopener with target=_parent does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that rel=noopener with target=_top does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: NOTRUN
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
new file mode 100644
index 00000000000..178680e5d14
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
@@ -0,0 +1,2 @@
+[script-onerror-insertion-point-2.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini b/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
index 47a38444be4..97f8a0cc51f 100644
--- a/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
+++ b/tests/wpt/metadata/performance-timeline/webtiming-resolution.any.js.ini
@@ -1,6 +1,7 @@
 [webtiming-resolution.any.html]
   [Verifies the resolution of performance.now() is at least 5 microseconds.]
-   expected: FAIL
+    expected: FAIL
+
 
 [webtiming-resolution.any.worker.html]
   [Verifies the resolution of performance.now() is at least 20 microseconds.]
@@ -9,3 +10,6 @@
   [Verifies the resolution of entry.startTime is at least 20 microseconds.]
     expected: TIMEOUT
 
+  [Verifies the resolution of performance.now() is at least 5 microseconds.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini b/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
index 1c7ec9ce1db..b4090ef9fe2 100644
--- a/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
+++ b/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
@@ -1,4 +1,5 @@
 [crossorigin-sandwich-TAO.sub.html]
+  expected: ERROR
   [There should be one entry.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
index bfd4d6dd2d6..bf2a1d61bab 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/import-in-moduleworker.html.ini
@@ -1,5 +1,4 @@
 [import-in-moduleworker.html]
-  expected: ERROR
   [Base URL in module dedicated workers: import]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
index 650c91da4a6..333edb3a26e 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
@@ -1,5 +1,4 @@
 [sharedworker-in-worker.html]
-  expected: ERROR
   [Base URL in workers: new SharedWorker()]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
deleted file mode 100644
index 80f9a4f15b8..00000000000
--- a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Worker-constructor.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
index f584fce5df1..268949ced5c 100644
--- a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
+++ b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
@@ -1,5 +1,4 @@
 [005.html]
-  expected: ERROR
   [dedicated worker in shared worker in dedicated worker]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
index 49f489d2a1c..d6e39444229 100644
--- a/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
+++ b/tests/wpt/metadata/workers/semantics/run-a-worker/003.html.ini
@@ -1,6 +1,5 @@
 [003.html]
   type: testharness
-  expected: ERROR
   [shared]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/css/css-overflow/scroll-overflow-padding-block-001.html b/tests/wpt/web-platform-tests/css/css-overflow/scroll-overflow-padding-block-001.html
new file mode 100644
index 00000000000..13df853ab34
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-overflow/scroll-overflow-padding-block-001.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<title>Test "end-edges" of scrollable overflows in various writing modes</title>
+<link rel="help" href="https://drafts.csswg.org/css-overflow-3/#scrollable">
+<link rel="author" href="mailto:kojii@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+scroller {
+  display: inline-block;
+  overflow: auto;
+  width: 100px;
+  height: 100px;
+  font-size: 50px;
+  line-height: 1;
+}
+.vlr { writing-mode: vertical-lr; }
+.vrl { writing-mode: vertical-rl; }
+.htb > .block-start { padding-top: 200px; }
+.htb > .block-end { padding-bottom: 200px; }
+.vlr > .block-start { padding-left: 200px; }
+.vlr > .block-end { padding-right: 200px; }
+.vrl > .block-start { padding-right: 200px; }
+.vrl > .block-end { padding-left: 200px; }
+</style>
+<body>
+  <div id="log"></div>
+  <div class="htb">
+    <scroller class="block-start">A</scroller>
+    <scroller class="block-end">A</scroller>
+  </div>
+  <div class="vlr">
+    <scroller class="block-start">A</scroller>
+    <scroller class="block-end">A</scroller>
+  </div>
+  <div class="vrl">
+    <scroller class="block-start">A</scroller>
+    <scroller class="block-end">A</scroller>
+  </div>
+<script>
+for (let element of document.getElementsByTagName('scroller')) {
+  let writing_mode = getComputedStyle(element).writingMode;
+  test(() => {
+    assert_equals(element.scrollWidth, element.offsetWidth, "scrollWidth");
+    assert_equals(element.scrollHeight, element.offsetHeight, "scrollHeight");
+  }, writing_mode + ' ' + element.className);
+}
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/loading/lazyload/invisible-image.tentative.html b/tests/wpt/web-platform-tests/loading/lazyload/invisible-image.tentative.html
index b70889b0819..b8b945ee01e 100644
--- a/tests/wpt/web-platform-tests/loading/lazyload/invisible-image.tentative.html
+++ b/tests/wpt/web-platform-tests/loading/lazyload/invisible-image.tentative.html
@@ -14,9 +14,9 @@
   <img id="visibility_hidden" style="visibility:hidden;" src='resources/image.png?2'>
   <img id="display_none" style="display:none;" src='resources/image.png?3'>
   <img id="attribute_hidden" hidden src='resources/image.png?4'>
-  <img id="js_hidden" src='resources/image.png?5'>.
+  <img id="js_display_none" src='resources/image.png?5'>.
   <script>
-    document.getElementById("js_hidden").style = 'display:none;';
+    document.getElementById("js_display_none").style = 'display:none;';
   </script>
 </body>
 
@@ -29,7 +29,7 @@ Marked as tentative until https://github.com/whatwg/html/pull/3752 is landed.
   const visibility_hidden_element = document.getElementById("visibility_hidden");
   const display_none_element = document.getElementById("display_none");
   const attribute_hidden_element = document.getElementById("attribute_hidden");
-  const js_hidden_element = document.getElementById("js_hidden");
+  const js_display_none_element = document.getElementById("js_display_none");
 
   let has_window_loaded = false;
 
@@ -51,7 +51,7 @@ Marked as tentative until https://github.com/whatwg/html/pull/3752 is landed.
     Promise.all([image_fully_loaded_promise(visibility_hidden_element),
       image_fully_loaded_promise(display_none_element),
       image_fully_loaded_promise(attribute_hidden_element),
-      image_fully_loaded_promise(js_hidden_element)]).then(() => {
+      image_fully_loaded_promise(js_display_none_element)]).then(() => {
         t.done();
     });
   }, "Test that below-viewport invisible images that are not marked " +
diff --git a/tests/wpt/web-platform-tests/loading/lazyload/invisible-lazy-image.tentative.html b/tests/wpt/web-platform-tests/loading/lazyload/invisible-lazy-image.tentative.html
index 3a8e2591876..805d614e401 100644
--- a/tests/wpt/web-platform-tests/loading/lazyload/invisible-lazy-image.tentative.html
+++ b/tests/wpt/web-platform-tests/loading/lazyload/invisible-lazy-image.tentative.html
@@ -1,20 +1,26 @@
 <!DOCTYPE html>
 <head>
-  <title>Test that lazily loaded below the viewport invisible
-         images are not loaded</title>
+  <title>Test behavior of in viewport invisible lazy images</title>
   <link rel="author" title="Rob Buis" href="mailto:rbuis@igalia.com">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
+  <script src="common.js"></script>
 </head>
 
 <body>
-  <div style="height:10000px;"></div>
-  <img id="visibility_hidden" style="visibility:hidden;" src='resources/image.png?1' loading="lazy">
-  <img id="display_none" style="display:none;" src='resources/image.png?2' loading="lazy">
-  <img id="attribute_hidden" hidden src='resources/image.png?3' loading="lazy">
-  <img id="js_hidden" src='resources/image.png?4' loading="lazy">
+  <img id="expected" src='resources/image.png?1'>
+  <img id="visibility_hidden" style="visibility:hidden;"
+       src='resources/image.png?2&pipe=trickle(d1)' loading='lazy'
+       onload="visibility_hidden_img.resolve();" onerror="visibility_hidden_img.reject();">
+  <img id="display_none" style="display:none;" src='resources/image.png?3&pipe=trickle(d1)'
+       loading='lazy'
+       onload="display_none_img.resolve();" onerror="display_none_img.reject();">
+  <img id="attribute_hidden" hidden src='resources/image.png?4&pipe=trickle(d1)' loading='lazy'
+       onload="attribute_hidden_img.resolve();" onerror="attribute_hidden_img.reject();">
+  <img id="js_display_none" src='resources/image.png?5&pipe=trickle(d1)' loading='lazy'
+       onload="js_display_none_img.resolve();" onerror="js_display_none_img.reject();">
   <script>
-    document.getElementById("js_hidden").style = 'display:none;';
+    document.getElementById("js_display_none").style = 'display:none;';
   </script>
 </body>
 
@@ -23,41 +29,39 @@ Marked as tentative until https://github.com/whatwg/html/pull/3752 is landed.
 -->
 
 <script>
-  const visibility_hidden_element = document.getElementById("visibility_hidden");
-  const display_none_element = document.getElementById("display_none");
-  const attribute_hidden_element = document.getElementById("attribute_hidden");
-  const js_hidden_element = document.getElementById("js_hidden");
+  const expected = document.getElementById("expected");
+  const visibility_hidden_img = new ElementLoadPromise("visibility_hidden");
+  const display_none_img = new ElementLoadPromise("display_none");
+  const attribute_hidden_img = new ElementLoadPromise("attribute_hidden");
+  const js_display_none_img = new ElementLoadPromise("js_display_none");
+
+  let has_window_loaded = false;
 
   async_test(function(t) {
-    visibility_hidden_element.onload = e => {
-      t.step(function() {
-        t.unreached_func("Invisible image with loading=lazy should be loaded lazily.");
-      });
-    };
-    display_none_element.onload = e => {
-      t.step(function() {
-        t.unreached_func("Invisible image with loading=lazy should be loaded lazily.");
-      });
-    };
-    attribute_hidden_element.onload = e => {
-      t.step(function() {
-        t.unreached_func("Invisible image with loading=lazy should be loaded lazily.");
-      });
-    };
-    js_hidden_element.onload = e => {
-      t.step(function() {
-        t.unreached_func("Invisible image with loading=lazy should be loaded lazily.");
-      });
-    };
     window.addEventListener("load", t.step_func(function() {
-      visibility_hidden_element.scrollIntoView();
-      display_none_element.scrollIntoView();
-      attribute_hidden_element.scrollIntoView();
-      js_hidden_element.scrollIntoView();
+      has_window_loaded = true;
     }));
 
-    t.step_timeout(function() { t.done(); }, 2000);
-  }, "Test that lazily loaded below the viewport invisible images " +
-     "are not loaded");
+    display_none_img.promise.then(
+      t.unreached_func("The lazy image with display:none should not load since it is hidden.")
+    ).catch(t.unreached_func("The error event should not fire for lazy images with display none."));
+
+    attribute_hidden_img.promise.then(
+      t.unreached_func("The lazy image with attribute hidden should not load since it is hidden.")
+    ).catch(t.unreached_func("The error event should not fire for lazy image with attribute hidden."));
+
+    js_display_none_img.promise.then(
+      t.unreached_func("The lazy image with display:none set by JS should not load since it is hidden.")
+    ).catch(t.unreached_func("The error event should not fire for lazy image with display none set by JS."));
+
+    visibility_hidden_img.promise.then(
+      t.step_func(function() {
+        assert_true(is_image_fully_loaded(visibility_hidden_img.element(),
+                                          expected));
+        assert_true(has_window_loaded);
+        t.step_timeout(function() { t.done(); }, 2000);
+      })
+    ).catch(t.unreached_func("The error event should not fire for lazy image with visibility hidden."));
+  }, "Test behavior of in viewport invisible lazy images");
 </script>
 
diff --git a/tests/wpt/webgl/meta/conformance/glsl/bugs/long-expressions-should-not-crash.html.ini b/tests/wpt/webgl/meta/conformance/glsl/bugs/long-expressions-should-not-crash.html.ini
deleted file mode 100644
index a62aadf2b61..00000000000
--- a/tests/wpt/webgl/meta/conformance/glsl/bugs/long-expressions-should-not-crash.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[long-expressions-should-not-crash.html]
-  expected: TIMEOUT