diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 611fccbf974..f5461d892e5 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -2018,9 +2018,11 @@ impl Window {
         if self.prepare_for_screenshot && for_display {
             // Checks if the html element has reftest-wait attribute present.
             // See http://testthewebforward.org/docs/reftests.html
+            // and https://web-platform-tests.org/writing-tests/crashtest.html
             let html_element = document.GetDocumentElement();
             let reftest_wait = html_element.map_or(false, |elem| {
-                elem.has_class(&atom!("reftest-wait"), CaseSensitivity::CaseSensitive)
+                elem.has_class(&atom!("reftest-wait"), CaseSensitivity::CaseSensitive) ||
+                    elem.has_class(&Atom::from("test-wait"), CaseSensitivity::CaseSensitive)
             });
 
             let has_sent_idle_message = self.has_sent_idle_message.get();
diff --git a/tests/wpt/meta/css/compositing/opacity-and-transform-animation-crash.html.ini b/tests/wpt/meta/css/compositing/opacity-and-transform-animation-crash.html.ini
new file mode 100644
index 00000000000..446c7b29843
--- /dev/null
+++ b/tests/wpt/meta/css/compositing/opacity-and-transform-animation-crash.html.ini
@@ -0,0 +1,2 @@
+[opacity-and-transform-animation-crash.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/css/css-animations/crashtests/replace-keyframes-animating-filter-001.html.ini b/tests/wpt/meta/css/css-animations/crashtests/replace-keyframes-animating-filter-001.html.ini
new file mode 100644
index 00000000000..9b287d7ff2d
--- /dev/null
+++ b/tests/wpt/meta/css/css-animations/crashtests/replace-keyframes-animating-filter-001.html.ini
@@ -0,0 +1,2 @@
+[replace-keyframes-animating-filter-001.html]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-cascade/scope-shadow-sharing.html.ini b/tests/wpt/meta/css/css-cascade/scope-shadow-sharing.html.ini
index ba5f030033e..7d09e3b651b 100644
--- a/tests/wpt/meta/css/css-cascade/scope-shadow-sharing.html.ini
+++ b/tests/wpt/meta/css/css-cascade/scope-shadow-sharing.html.ini
@@ -1,2 +1,2 @@
 [scope-shadow-sharing.html]
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-flexbox/animation/flex-basis-content-crash.html.ini b/tests/wpt/meta/css/css-flexbox/animation/flex-basis-content-crash.html.ini
new file mode 100644
index 00000000000..e4dc75a732d
--- /dev/null
+++ b/tests/wpt/meta/css/css-flexbox/animation/flex-basis-content-crash.html.ini
@@ -0,0 +1,2 @@
+[flex-basis-content-crash.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/css/css-paint-api/column-count-crash.https.html.ini b/tests/wpt/meta/css/css-paint-api/column-count-crash.https.html.ini
new file mode 100644
index 00000000000..25962d99dc7
--- /dev/null
+++ b/tests/wpt/meta/css/css-paint-api/column-count-crash.https.html.ini
@@ -0,0 +1,2 @@
+[column-count-crash.https.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/css/cssom-view/overflow-hidden-smooth-scroll-crash.html.ini b/tests/wpt/meta/css/cssom-view/overflow-hidden-smooth-scroll-crash.html.ini
new file mode 100644
index 00000000000..be3485a2cc8
--- /dev/null
+++ b/tests/wpt/meta/css/cssom-view/overflow-hidden-smooth-scroll-crash.html.ini
@@ -0,0 +1,2 @@
+[overflow-hidden-smooth-scroll-crash.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/css/filter-effects/feimage-circular-reference-foreign-object-crash.html.ini b/tests/wpt/meta/css/filter-effects/feimage-circular-reference-foreign-object-crash.html.ini
new file mode 100644
index 00000000000..750576a9ea9
--- /dev/null
+++ b/tests/wpt/meta/css/filter-effects/feimage-circular-reference-foreign-object-crash.html.ini
@@ -0,0 +1,2 @@
+[feimage-circular-reference-foreign-object-crash.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/css/filter-effects/feimage-reference-foreign-object-crash.html.ini b/tests/wpt/meta/css/filter-effects/feimage-reference-foreign-object-crash.html.ini
new file mode 100644
index 00000000000..c7c2f18cd0e
--- /dev/null
+++ b/tests/wpt/meta/css/filter-effects/feimage-reference-foreign-object-crash.html.ini
@@ -0,0 +1,2 @@
+[feimage-reference-foreign-object-crash.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/dom/abort/abort-signal-any-crash.html.ini b/tests/wpt/meta/dom/abort/abort-signal-any-crash.html.ini
new file mode 100644
index 00000000000..362db443d6c
--- /dev/null
+++ b/tests/wpt/meta/dom/abort/abort-signal-any-crash.html.ini
@@ -0,0 +1,2 @@
+[abort-signal-any-crash.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/encoding/streams/stringification-crash.html.ini b/tests/wpt/meta/encoding/streams/stringification-crash.html.ini
new file mode 100644
index 00000000000..da00626042c
--- /dev/null
+++ b/tests/wpt/meta/encoding/streams/stringification-crash.html.ini
@@ -0,0 +1,2 @@
+[stringification-crash.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/fullscreen/crashtests/content-visibility-crash.html.ini b/tests/wpt/meta/fullscreen/crashtests/content-visibility-crash.html.ini
new file mode 100644
index 00000000000..39620c6a4e9
--- /dev/null
+++ b/tests/wpt/meta/fullscreen/crashtests/content-visibility-crash.html.ini
@@ -0,0 +1,2 @@
+[content-visibility-crash.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/html/canvas/element/manual/filters/svg-filter-lh-rlh.html.ini b/tests/wpt/meta/html/canvas/element/manual/filters/svg-filter-lh-rlh.html.ini
index 3e854890a7f..58cd6e2307d 100644
--- a/tests/wpt/meta/html/canvas/element/manual/filters/svg-filter-lh-rlh.html.ini
+++ b/tests/wpt/meta/html/canvas/element/manual/filters/svg-filter-lh-rlh.html.ini
@@ -1,2 +1,2 @@
 [svg-filter-lh-rlh.html]
-  expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/crashtests/fieldset-middleclick.html.ini b/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/crashtests/fieldset-middleclick.html.ini
new file mode 100644
index 00000000000..fcf83f51ee6
--- /dev/null
+++ b/tests/wpt/meta/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/crashtests/fieldset-middleclick.html.ini
@@ -0,0 +1,2 @@
+[fieldset-middleclick.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/html/semantics/interactive-elements/the-dialog-element/showmodal-shadow-sibling-frame-crash.html.ini b/tests/wpt/meta/html/semantics/interactive-elements/the-dialog-element/showmodal-shadow-sibling-frame-crash.html.ini
new file mode 100644
index 00000000000..dea85fdffcd
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/interactive-elements/the-dialog-element/showmodal-shadow-sibling-frame-crash.html.ini
@@ -0,0 +1,2 @@
+[showmodal-shadow-sibling-frame-crash.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/resize-observer/multiple-observers-with-mutation-crash.html.ini b/tests/wpt/meta/resize-observer/multiple-observers-with-mutation-crash.html.ini
new file mode 100644
index 00000000000..1039e244e19
--- /dev/null
+++ b/tests/wpt/meta/resize-observer/multiple-observers-with-mutation-crash.html.ini
@@ -0,0 +1,2 @@
+[multiple-observers-with-mutation-crash.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/meta/selection/crashtests/selection-modify-line-boundary-around-empty-details.html.ini b/tests/wpt/meta/selection/crashtests/selection-modify-line-boundary-around-empty-details.html.ini
new file mode 100644
index 00000000000..1f59e70eff3
--- /dev/null
+++ b/tests/wpt/meta/selection/crashtests/selection-modify-line-boundary-around-empty-details.html.ini
@@ -0,0 +1,2 @@
+[selection-modify-line-boundary-around-empty-details.html]
+    expected: TIMEOUT
\ No newline at end of file
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 72aecc6fb1f..d3859f7b1d8 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -8,6 +8,13 @@
       null,
       {}
      ]
+    ],
+    "test-wait-crash.html": [
+     "2419da6af0c278a17b9ff974d4418f9e386ef3e0",
+     [
+      null,
+      {}
+     ]
     ]
    }
   },
diff --git a/tests/wpt/mozilla/tests/mozilla/test-wait-crash.html b/tests/wpt/mozilla/tests/mozilla/test-wait-crash.html
new file mode 100644
index 00000000000..2419da6af0c
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/test-wait-crash.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html class="test-wait">
+<meta charset="utf-8">
+<meta name="assert" content="The test should not crash.">
+
+<script>
+  fetch('/common/slow.py?delay=5000').then(() => document.documentElement.classList.remove("test-wait"));
+</script>