diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index 37236789655..2cfe3ac2422 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -1484,11 +1484,10 @@ where
             // Panic a top level browsing context.
             FromCompositorMsg::SendError(top_level_browsing_context_id, error) => {
                 debug!("constellation got SendError message");
-                if let Some(id) = top_level_browsing_context_id {
-                    self.handle_panic(id, error, None);
-                } else {
+                if top_level_browsing_context_id.is_none() {
                     warn!("constellation got a SendError message without top level id");
                 }
+                self.handle_panic(top_level_browsing_context_id, error, None);
             },
             // Send frame tree to WebRender. Make it visible.
             FromCompositorMsg::SelectBrowser(top_level_browsing_context_id) => {
@@ -2752,15 +2751,13 @@ where
             .pipelines
             .get(&pipeline_id)
             .map(|pipeline| pipeline.top_level_browsing_context_id);
-        if let Some(top_level_browsing_context_id) = top_level_browsing_context_id {
-            let reason = format!("Send failed ({})", err);
-            self.handle_panic(top_level_browsing_context_id, reason, None);
-        }
+        let reason = format!("Send failed ({})", err);
+        self.handle_panic(top_level_browsing_context_id, reason, None);
     }
 
     fn handle_panic(
         &mut self,
-        top_level_browsing_context_id: TopLevelBrowsingContextId,
+        top_level_browsing_context_id: Option<TopLevelBrowsingContextId>,
         reason: String,
         backtrace: Option<String>,
     ) {
@@ -2771,6 +2768,11 @@ where
             process::exit(1);
         }
 
+        let top_level_browsing_context_id = match top_level_browsing_context_id {
+            Some(id) => id,
+            None => return,
+        };
+
         debug!(
             "Panic handler for top-level browsing context {}: {}.",
             top_level_browsing_context_id, reason
@@ -2852,13 +2854,16 @@ where
         entry: LogEntry,
     ) {
         debug!("Received log entry {:?}.", entry);
-        match (entry, top_level_browsing_context_id) {
-            (LogEntry::Panic(reason, backtrace), Some(top_level_browsing_context_id)) => {
-                self.handle_panic(top_level_browsing_context_id, reason, Some(backtrace));
-            },
-            (LogEntry::Panic(reason, _), _) |
-            (LogEntry::Error(reason), _) |
-            (LogEntry::Warn(reason), _) => {
+        if let LogEntry::Panic(ref reason, ref backtrace) = entry {
+            self.handle_panic(
+                top_level_browsing_context_id,
+                reason.clone(),
+                Some(backtrace.clone()),
+            );
+        }
+
+        match entry {
+            LogEntry::Panic(reason, _) | LogEntry::Error(reason) | LogEntry::Warn(reason) => {
                 // VecDeque::truncate is unstable
                 if WARNINGS_BUFFER_SIZE <= self.handled_warnings.len() {
                     self.handled_warnings.pop_front();
diff --git a/ports/winit/main2.rs b/ports/winit/main2.rs
index 07d931c21ab..2cccdb9550d 100644
--- a/ports/winit/main2.rs
+++ b/ports/winit/main2.rs
@@ -117,11 +117,11 @@ pub fn main() {
         };
         let current_thread = thread::current();
         let name = current_thread.name().unwrap_or("<unnamed>");
-        let stdout = std::io::stdout();
-        let mut stdout = stdout.lock();
+        let stderr = std::io::stderr();
+        let mut stderr = stderr.lock();
         if let Some(location) = info.location() {
             let _ = writeln!(
-                &mut stdout,
+                &mut stderr,
                 "{} (thread {}, at {}:{})",
                 msg,
                 name,
@@ -129,12 +129,16 @@ pub fn main() {
                 location.line()
             );
         } else {
-            let _ = writeln!(&mut stdout, "{} (thread {})", msg, name);
+            let _ = writeln!(&mut stderr, "{} (thread {})", msg, name);
         }
         if env::var("RUST_BACKTRACE").is_ok() {
-            let _ = backtrace::print(&mut stdout);
+            let _ = backtrace::print(&mut stderr);
+        }
+        drop(stderr);
+
+        if opts::get().hard_fail && !opts::get().multiprocess {
+            std::process::exit(1);
         }
-        drop(stdout);
 
         error!("{}", msg);
     }));
diff --git a/python/wpt/grouping_formatter.py b/python/wpt/grouping_formatter.py
index fcf9fcbe69d..4e14d62b573 100644
--- a/python/wpt/grouping_formatter.py
+++ b/python/wpt/grouping_formatter.py
@@ -216,10 +216,8 @@ class ServoHandler(mozlog.reader.LogHandler):
         ))
 
     def process_output(self, data):
-        if data['thread'] not in self.running_tests:
-            return
-        test_name = self.running_tests[data['thread']]
-        self.test_output[test_name] += data['data'] + "\n"
+        if 'test' in data:
+            self.test_output[data['test']] += data['data'] + "\n"
 
     def log(self, _):
         pass
diff --git a/python/wpt/run.py b/python/wpt/run.py
index ab028f670c1..7fec9986c8d 100644
--- a/python/wpt/run.py
+++ b/python/wpt/run.py
@@ -86,7 +86,7 @@ def run_tests(default_binary_path: str, **kwargs):
 
     if not kwargs.get("no_default_test_types"):
         test_types = {
-            "servo": ["testharness", "reftest", "wdspec"],
+            "servo": ["testharness", "reftest", "wdspec", "crashtest"],
             "servodriver": ["testharness", "reftest"],
         }
         product = kwargs.get("product") or "servo"
diff --git a/tests/wpt/meta-legacy-layout/css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html.ini b/tests/wpt/meta-legacy-layout/css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html.ini
new file mode 100644
index 00000000000..7859076f84d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-flexbox/contain-size-layout-abspos-flex-container-crash.html.ini
@@ -0,0 +1,2 @@
+[contain-size-layout-abspos-flex-container-crash.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-alpha.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-alpha.https.html.ini
new file mode 100644
index 00000000000..58fc6a0d970
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-alpha.https.html.ini
@@ -0,0 +1,2 @@
+[background-image-alpha.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-multiple.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-multiple.https.html.ini
new file mode 100644
index 00000000000..5105718061d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-multiple.https.html.ini
@@ -0,0 +1,2 @@
+[background-image-multiple.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/background-repeat-x.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/background-repeat-x.https.html.ini
new file mode 100644
index 00000000000..2026c53d4f8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/background-repeat-x.https.html.ini
@@ -0,0 +1,2 @@
+[background-repeat-x.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/column-count-crash.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/column-count-crash.https.html.ini
new file mode 100644
index 00000000000..ed71c8e0957
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/column-count-crash.https.html.ini
@@ -0,0 +1,2 @@
+[column-count-crash.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/custom-property-animation-on-main-thread.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/custom-property-animation-on-main-thread.https.html.ini
index 2460e466ee2..1ae2581e041 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/custom-property-animation-on-main-thread.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/custom-property-animation-on-main-thread.https.html.ini
@@ -1,2 +1,2 @@
 [custom-property-animation-on-main-thread.https.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-001.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-001.https.html.ini
new file mode 100644
index 00000000000..345acad1c69
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-001.https.html.ini
@@ -0,0 +1,2 @@
+[geometry-background-image-001.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-002.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-002.https.html.ini
new file mode 100644
index 00000000000..c733b5aa509
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-002.https.html.ini
@@ -0,0 +1,2 @@
+[geometry-background-image-002.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-001.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-001.https.html.ini
new file mode 100644
index 00000000000..724d0ee4c9c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-001.https.html.ini
@@ -0,0 +1,2 @@
+[geometry-background-image-tiled-001.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-002.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-002.https.html.ini
new file mode 100644
index 00000000000..3de2c084af5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-002.https.html.ini
@@ -0,0 +1,2 @@
+[geometry-background-image-tiled-002.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-003.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-003.https.html.ini
new file mode 100644
index 00000000000..b077acbc024
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-003.https.html.ini
@@ -0,0 +1,2 @@
+[geometry-background-image-tiled-003.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-001.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-001.https.html.ini
new file mode 100644
index 00000000000..b06534035f2
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-001.https.html.ini
@@ -0,0 +1,2 @@
+[geometry-border-image-001.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-002.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-002.https.html.ini
new file mode 100644
index 00000000000..83b4b2face5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-002.https.html.ini
@@ -0,0 +1,2 @@
+[geometry-border-image-002.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-003.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-003.https.html.ini
new file mode 100644
index 00000000000..06b91601f14
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-003.https.html.ini
@@ -0,0 +1,2 @@
+[geometry-border-image-003.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-004.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-004.https.html.ini
new file mode 100644
index 00000000000..a7e0e8a5bf9
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-004.https.html.ini
@@ -0,0 +1,2 @@
+[geometry-border-image-004.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-005.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-005.https.html.ini
new file mode 100644
index 00000000000..30ee29c89fc
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-005.https.html.ini
@@ -0,0 +1,2 @@
+[geometry-border-image-005.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-with-float-size.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-with-float-size.https.html.ini
index 0531826fde8..47eb89029a5 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-with-float-size.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-with-float-size.https.html.ini
@@ -1,3 +1,3 @@
 [geometry-with-float-size.https.html]
   type: reftest
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/hidpi/canvas-transform.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/hidpi/canvas-transform.https.html.ini
index 3950118e711..f24e9813505 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/hidpi/canvas-transform.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/hidpi/canvas-transform.https.html.ini
@@ -1,2 +1,2 @@
 [canvas-transform.https.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/hidpi/device-pixel-ratio.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/hidpi/device-pixel-ratio.https.html.ini
index 7954ffb5449..65354a69a37 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/hidpi/device-pixel-ratio.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/hidpi/device-pixel-ratio.https.html.ini
@@ -1,3 +1,3 @@
 [device-pixel-ratio.https.html]
   type: reftest
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-constructor-error.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-constructor-error.https.html.ini
new file mode 100644
index 00000000000..2a61eacfab3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-constructor-error.https.html.ini
@@ -0,0 +1,2 @@
+[invalid-image-constructor-error.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-paint-error.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-paint-error.https.html.ini
new file mode 100644
index 00000000000..50bbb286f63
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-paint-error.https.html.ini
@@ -0,0 +1,2 @@
+[invalid-image-paint-error.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-pending-script.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-pending-script.https.html.ini
new file mode 100644
index 00000000000..3cfc38c10fd
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-pending-script.https.html.ini
@@ -0,0 +1,2 @@
+[invalid-image-pending-script.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/non-registered-property-value.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/non-registered-property-value.https.html.ini
new file mode 100644
index 00000000000..4ed81cc06ad
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/non-registered-property-value.https.html.ini
@@ -0,0 +1,2 @@
+[non-registered-property-value.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/overdraw.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/overdraw.https.html.ini
new file mode 100644
index 00000000000..47dce433f71
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/overdraw.https.html.ini
@@ -0,0 +1,2 @@
+[overdraw.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-arguments.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-arguments.https.html.ini
new file mode 100644
index 00000000000..db163b4c35f
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-arguments.https.html.ini
@@ -0,0 +1,2 @@
+[paint-arguments.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-function-arguments-var.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-function-arguments-var.https.html.ini
index b09f8785f58..d41dbc6c82a 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-function-arguments-var.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-function-arguments-var.https.html.ini
@@ -1,2 +1,2 @@
 [paint-function-arguments-var.https.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-function-arguments.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-function-arguments.https.html.ini
new file mode 100644
index 00000000000..7d5d6e38be0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-function-arguments.https.html.ini
@@ -0,0 +1,2 @@
+[paint-function-arguments.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-function-this-value.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-function-this-value.https.html.ini
new file mode 100644
index 00000000000..c7e6ff24bbb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-function-this-value.https.html.ini
@@ -0,0 +1,2 @@
+[paint-function-this-value.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-canvasFilter.tentative.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-canvasFilter.tentative.https.html.ini
new file mode 100644
index 00000000000..fc8edae93dd
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-canvasFilter.tentative.https.html.ini
@@ -0,0 +1,2 @@
+[paint2d-canvasFilter.tentative.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-composite.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-composite.https.html.ini
new file mode 100644
index 00000000000..d9f8adf47c3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-composite.https.html.ini
@@ -0,0 +1,2 @@
+[paint2d-composite.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-conicGradient.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-conicGradient.https.html.ini
new file mode 100644
index 00000000000..acbfdc97008
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-conicGradient.https.html.ini
@@ -0,0 +1,2 @@
+[paint2d-conicGradient.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-filter.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-filter.https.html.ini
new file mode 100644
index 00000000000..1378c3b32c5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-filter.https.html.ini
@@ -0,0 +1,2 @@
+[paint2d-filter.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-gradient.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-gradient.https.html.ini
new file mode 100644
index 00000000000..fd273875788
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-gradient.https.html.ini
@@ -0,0 +1,2 @@
+[paint2d-gradient.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-image.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-image.https.html.ini
new file mode 100644
index 00000000000..bb15a16f2c2
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-image.https.html.ini
@@ -0,0 +1,2 @@
+[paint2d-image.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-paths.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-paths.https.html.ini
index 49388848526..7fb82910fcc 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-paths.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-paths.https.html.ini
@@ -1,4 +1,4 @@
 [paint2d-paths.https.html]
   type: reftest
-  expected: FAIL
   bug: https://github.com/servo/servo/issues/17597
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-rects.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-rects.https.html.ini
new file mode 100644
index 00000000000..c2741649c9d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-rects.https.html.ini
@@ -0,0 +1,2 @@
+[paint2d-rects.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-reset.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-reset.https.html.ini
index 91f2741e4c9..0b5d9be245f 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-reset.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-reset.https.html.ini
@@ -1,2 +1,2 @@
 [paint2d-reset.https.html]
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-roundRect.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-roundRect.https.html.ini
new file mode 100644
index 00000000000..718b843baaa
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-roundRect.https.html.ini
@@ -0,0 +1,2 @@
+[paint2d-roundRect.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-shadows.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-shadows.https.html.ini
new file mode 100644
index 00000000000..111386c79a3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-shadows.https.html.ini
@@ -0,0 +1,2 @@
+[paint2d-shadows.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-transform.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-transform.https.html.ini
new file mode 100644
index 00000000000..7e77a4b5239
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-transform.https.html.ini
@@ -0,0 +1,2 @@
+[paint2d-transform.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-001.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-001.https.html.ini
new file mode 100644
index 00000000000..8c575d90457
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-001.https.html.ini
@@ -0,0 +1,2 @@
+[parse-input-arguments-001.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-002.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-002.https.html.ini
index 86d08faea46..29b61ebe7e6 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-002.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-002.https.html.ini
@@ -1,3 +1,4 @@
 [parse-input-arguments-002.https.html]
   type: reftest
   bug: https://github.com/servo/servo/issues/17852
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-003.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-003.https.html.ini
index 6262474d196..b611dd00c86 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-003.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-003.https.html.ini
@@ -1,3 +1,4 @@
 [parse-input-arguments-003.https.html]
   type: reftest
   bug: https://github.com/servo/servo/issues/17852
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-004.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-004.https.html.ini
new file mode 100644
index 00000000000..6a2fd730063
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-004.https.html.ini
@@ -0,0 +1,2 @@
+[parse-input-arguments-004.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-005.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-005.https.html.ini
index 56c27026efc..d7c21139146 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-005.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-005.https.html.ini
@@ -1,3 +1,4 @@
 [parse-input-arguments-005.https.html]
   type: reftest
   bug: https://github.com/servo/servo/issues/17852
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-006.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-006.https.html.ini
index 5329501fd03..395996e3e17 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-006.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-006.https.html.ini
@@ -1,3 +1,4 @@
 [parse-input-arguments-006.https.html]
   type: reftest
   bug: https://github.com/servo/servo/issues/17852
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-007.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-007.https.html.ini
new file mode 100644
index 00000000000..48916610dd6
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-007.https.html.ini
@@ -0,0 +1,2 @@
+[parse-input-arguments-007.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-008.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-008.https.html.ini
index 0511e68318d..3fe1da65bf9 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-008.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-008.https.html.ini
@@ -1,3 +1,4 @@
 [parse-input-arguments-008.https.html]
   type: reftest
   bug: https://github.com/servo/servo/issues/17852
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-009.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-009.https.html.ini
index ae92e1907f7..68b1e418480 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-009.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-009.https.html.ini
@@ -1,3 +1,4 @@
 [parse-input-arguments-009.https.html]
   type: reftest
   bug: https://github.com/servo/servo/issues/17852
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-010.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-010.https.html.ini
index e9ca37a27e1..67d300f28dd 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-010.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-010.https.html.ini
@@ -1,3 +1,4 @@
 [parse-input-arguments-010.https.html]
   type: reftest
   bug: https://github.com/servo/servo/issues/17852
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-011.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-011.https.html.ini
index b6e0272ac24..1040753e6a8 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-011.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-011.https.html.ini
@@ -1,3 +1,4 @@
 [parse-input-arguments-011.https.html]
   type: reftest
   bug: https://github.com/servo/servo/issues/17852
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-012.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-012.https.html.ini
index 927fd4189bc..a491061f09b 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-012.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-012.https.html.ini
@@ -1,3 +1,4 @@
 [parse-input-arguments-012.https.html]
   type: reftest
   bug: https://github.com/servo/servo/issues/17852
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-013.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-013.https.html.ini
new file mode 100644
index 00000000000..72a7814615a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-013.https.html.ini
@@ -0,0 +1,2 @@
+[parse-input-arguments-013.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-014.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-014.https.html.ini
new file mode 100644
index 00000000000..9c740fade41
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-014.https.html.ini
@@ -0,0 +1,2 @@
+[parse-input-arguments-014.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-015.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-015.https.html.ini
new file mode 100644
index 00000000000..2da534683b5
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-015.https.html.ini
@@ -0,0 +1,2 @@
+[parse-input-arguments-015.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-016.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-016.https.html.ini
index 685d1f18027..6723b5c1757 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-016.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-016.https.html.ini
@@ -1,3 +1,4 @@
 [parse-input-arguments-016.https.html]
   type: reftest
   bug: https://github.com/servo/servo/issues/17852
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-017.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-017.https.html.ini
new file mode 100644
index 00000000000..96bfc090656
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-017.https.html.ini
@@ -0,0 +1,2 @@
+[parse-input-arguments-017.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-018.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-018.https.html.ini
index 63f6daf4cf9..5ee11a9c995 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-018.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-018.https.html.ini
@@ -1,3 +1,3 @@
 [parse-input-arguments-018.https.html]
   type: reftest
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-019.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-019.https.html.ini
new file mode 100644
index 00000000000..63e16db6356
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-019.https.html.ini
@@ -0,0 +1,2 @@
+[parse-input-arguments-019.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-020.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-020.https.html.ini
new file mode 100644
index 00000000000..804459aec12
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-020.https.html.ini
@@ -0,0 +1,2 @@
+[parse-input-arguments-020.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-021.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-021.https.html.ini
new file mode 100644
index 00000000000..a8f25bcb50e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-021.https.html.ini
@@ -0,0 +1,2 @@
+[parse-input-arguments-021.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-022.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-022.https.html.ini
new file mode 100644
index 00000000000..7d7eedf9102
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-022.https.html.ini
@@ -0,0 +1,2 @@
+[parse-input-arguments-022.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/roundrect.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/roundrect.https.html.ini
new file mode 100644
index 00000000000..a699234f856
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/roundrect.https.html.ini
@@ -0,0 +1,2 @@
+[roundrect.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-001.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-001.https.html.ini
new file mode 100644
index 00000000000..376397625f8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-001.https.html.ini
@@ -0,0 +1,2 @@
+[setTransform-001.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-002.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-002.https.html.ini
new file mode 100644
index 00000000000..184addaf0fa
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-002.https.html.ini
@@ -0,0 +1,2 @@
+[setTransform-002.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-003.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-003.https.html.ini
new file mode 100644
index 00000000000..2bef72de0ef
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-003.https.html.ini
@@ -0,0 +1,2 @@
+[setTransform-003.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-004.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-004.https.html.ini
new file mode 100644
index 00000000000..cc9a70a21f0
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-004.https.html.ini
@@ -0,0 +1,2 @@
+[setTransform-004.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/style-background-image.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/style-background-image.https.html.ini
index 56669e8c173..73b213324cf 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/style-background-image.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/style-background-image.https.html.ini
@@ -1,4 +1,4 @@
 [style-background-image.https.html]
   type: reftest
-  expected: FAIL
   bug: https://github.com/servo/servo/issues/17378
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/style-before-pseudo.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/style-before-pseudo.https.html.ini
index a262749dfc9..20081c8b1b5 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/style-before-pseudo.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/style-before-pseudo.https.html.ini
@@ -1,4 +1,4 @@
 [style-before-pseudo.https.html]
   type: reftest
-  expected: FAIL
   bug: https://github.com/servo/servo/issues/17854
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/style-first-letter-pseudo.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/style-first-letter-pseudo.https.html.ini
index 5a7400be26d..ec9fb10ff97 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/style-first-letter-pseudo.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/style-first-letter-pseudo.https.html.ini
@@ -1,4 +1,4 @@
 [style-first-letter-pseudo.https.html]
   type: reftest
-  expected: FAIL
   bug: https://github.com/servo/servo/issues/17854
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/valid-image-after-load.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/valid-image-after-load.https.html.ini
new file mode 100644
index 00000000000..d6133c8d50d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/valid-image-after-load.https.html.ini
@@ -0,0 +1,2 @@
+[valid-image-after-load.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/valid-image-before-load.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/valid-image-before-load.https.html.ini
new file mode 100644
index 00000000000..f04a20c9704
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/valid-image-before-load.https.html.ini
@@ -0,0 +1,2 @@
+[valid-image-before-load.https.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-position/overlay/overlay-popover-backdrop-crash.html.ini b/tests/wpt/meta-legacy-layout/css/css-position/overlay/overlay-popover-backdrop-crash.html.ini
new file mode 100644
index 00000000000..e9bcde03015
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-position/overlay/overlay-popover-backdrop-crash.html.ini
@@ -0,0 +1,2 @@
+[overlay-popover-backdrop-crash.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-text/ellisize-rtl-text-crash.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/ellisize-rtl-text-crash.html.ini
new file mode 100644
index 00000000000..928d615c603
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/css-text/ellisize-rtl-text-crash.html.ini
@@ -0,0 +1,2 @@
+[ellisize-rtl-text-crash.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/client-props-root-display-none-crash.html.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/client-props-root-display-none-crash.html.ini
new file mode 100644
index 00000000000..4988844446b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/client-props-root-display-none-crash.html.ini
@@ -0,0 +1,2 @@
+[client-props-root-display-none-crash.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/filter-effects/crashtests/broken-reference-crash-001.html.ini b/tests/wpt/meta-legacy-layout/css/filter-effects/crashtests/broken-reference-crash-001.html.ini
new file mode 100644
index 00000000000..28668363c2d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/filter-effects/crashtests/broken-reference-crash-001.html.ini
@@ -0,0 +1,2 @@
+[broken-reference-crash-001.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/fullscreen/crashtests/chrome-1312699.html.ini b/tests/wpt/meta-legacy-layout/fullscreen/crashtests/chrome-1312699.html.ini
new file mode 100644
index 00000000000..f1efc6d3c4c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/fullscreen/crashtests/chrome-1312699.html.ini
@@ -0,0 +1,2 @@
+[chrome-1312699.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-input-element/input-form-detach-style-crash.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-input-element/input-form-detach-style-crash.html.ini
new file mode 100644
index 00000000000..0c0b0de0604
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-input-element/input-form-detach-style-crash.html.ini
@@ -0,0 +1,2 @@
+[input-form-detach-style-crash.html]
+  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-dialog-crash.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-dialog-crash.html.ini
new file mode 100644
index 00000000000..e01429a48a2
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-dialog-crash.html.ini
@@ -0,0 +1,2 @@
+[popover-dialog-crash.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-hint-crash.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-hint-crash.tentative.html.ini
new file mode 100644
index 00000000000..321a2116951
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-hint-crash.tentative.html.ini
@@ -0,0 +1,2 @@
+[popover-hint-crash.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-manual-crash.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-manual-crash.html.ini
new file mode 100644
index 00000000000..72f788df367
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-manual-crash.html.ini
@@ -0,0 +1,2 @@
+[popover-manual-crash.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/webaudio/the-audio-api/processing-model/cycle-without-delay.html.ini b/tests/wpt/meta-legacy-layout/webaudio/the-audio-api/processing-model/cycle-without-delay.html.ini
new file mode 100644
index 00000000000..c0a5b66270c
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/webaudio/the-audio-api/processing-model/cycle-without-delay.html.ini
@@ -0,0 +1,2 @@
+[cycle-without-delay.html]
+  expected: CRASH
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index 833b804569b..88418a19c86 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -465041,7 +465041,7 @@
         []
        ],
        "executorservo.py": [
-        "a8ec38699616c5baf7a3b43b8149b89746308f35",
+        "3250c74ff4397d229e370a8c317b0e2a269dc9a8",
         []
        ],
        "executorservodriver.py": [
diff --git a/tests/wpt/meta/css/css-position/overlay/overlay-popover-backdrop-crash.html.ini b/tests/wpt/meta/css/css-position/overlay/overlay-popover-backdrop-crash.html.ini
new file mode 100644
index 00000000000..e9bcde03015
--- /dev/null
+++ b/tests/wpt/meta/css/css-position/overlay/overlay-popover-backdrop-crash.html.ini
@@ -0,0 +1,2 @@
+[overlay-popover-backdrop-crash.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/css-text/ellisize-rtl-text-crash.html.ini b/tests/wpt/meta/css/css-text/ellisize-rtl-text-crash.html.ini
new file mode 100644
index 00000000000..928d615c603
--- /dev/null
+++ b/tests/wpt/meta/css/css-text/ellisize-rtl-text-crash.html.ini
@@ -0,0 +1,2 @@
+[ellisize-rtl-text-crash.html]
+  expected: CRASH
diff --git a/tests/wpt/meta/css/css-transforms/crashtests/preserve3d-scene-001.html.ini b/tests/wpt/meta/css/css-transforms/crashtests/preserve3d-scene-001.html.ini
new file mode 100644
index 00000000000..376b626e352
--- /dev/null
+++ b/tests/wpt/meta/css/css-transforms/crashtests/preserve3d-scene-001.html.ini
@@ -0,0 +1,2 @@
+[preserve3d-scene-001.html]
+  expected: CRASH
diff --git a/tests/wpt/meta/css/css-transforms/crashtests/preserve3d-scene-002.html.ini b/tests/wpt/meta/css/css-transforms/crashtests/preserve3d-scene-002.html.ini
new file mode 100644
index 00000000000..e2f99f70289
--- /dev/null
+++ b/tests/wpt/meta/css/css-transforms/crashtests/preserve3d-scene-002.html.ini
@@ -0,0 +1,2 @@
+[preserve3d-scene-002.html]
+  expected: CRASH
diff --git a/tests/wpt/meta/css/filter-effects/crashtests/broken-reference-crash-001.html.ini b/tests/wpt/meta/css/filter-effects/crashtests/broken-reference-crash-001.html.ini
new file mode 100644
index 00000000000..28668363c2d
--- /dev/null
+++ b/tests/wpt/meta/css/filter-effects/crashtests/broken-reference-crash-001.html.ini
@@ -0,0 +1,2 @@
+[broken-reference-crash-001.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini
index 3ec67be350a..410ec4c1d39 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini
@@ -1,8 +1,5 @@
 [element-img-environment-change.sub.html]
   expected: TIMEOUT
-  [sec-fetch-site - Not sent to non-trustworthy same-origin destination, no attributes]
-    expected: FAIL
-
   [sec-fetch-site - Not sent to non-trustworthy same-site destination, no attributes]
     expected: TIMEOUT
 
diff --git a/tests/wpt/meta/fullscreen/crashtests/chrome-1312699.html.ini b/tests/wpt/meta/fullscreen/crashtests/chrome-1312699.html.ini
new file mode 100644
index 00000000000..f1efc6d3c4c
--- /dev/null
+++ b/tests/wpt/meta/fullscreen/crashtests/chrome-1312699.html.ini
@@ -0,0 +1,2 @@
+[chrome-1312699.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/popovers/popover-dialog-crash.html.ini b/tests/wpt/meta/html/semantics/popovers/popover-dialog-crash.html.ini
new file mode 100644
index 00000000000..e01429a48a2
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/popovers/popover-dialog-crash.html.ini
@@ -0,0 +1,2 @@
+[popover-dialog-crash.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/popovers/popover-hint-crash.tentative.html.ini b/tests/wpt/meta/html/semantics/popovers/popover-hint-crash.tentative.html.ini
new file mode 100644
index 00000000000..321a2116951
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/popovers/popover-hint-crash.tentative.html.ini
@@ -0,0 +1,2 @@
+[popover-hint-crash.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/popovers/popover-manual-crash.html.ini b/tests/wpt/meta/html/semantics/popovers/popover-manual-crash.html.ini
new file mode 100644
index 00000000000..72f788df367
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/popovers/popover-manual-crash.html.ini
@@ -0,0 +1,2 @@
+[popover-manual-crash.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/webaudio/the-audio-api/processing-model/cycle-without-delay.html.ini b/tests/wpt/meta/webaudio/the-audio-api/processing-model/cycle-without-delay.html.ini
new file mode 100644
index 00000000000..c0a5b66270c
--- /dev/null
+++ b/tests/wpt/meta/webaudio/the-audio-api/processing-model/cycle-without-delay.html.ini
@@ -0,0 +1,2 @@
+[cycle-without-delay.html]
+  expected: CRASH
diff --git a/tests/wpt/mozilla/meta-legacy-layout/mozilla/worklets/test_paint_worklet.html.ini b/tests/wpt/mozilla/meta-legacy-layout/mozilla/worklets/test_paint_worklet.html.ini
new file mode 100644
index 00000000000..c7f59053c7a
--- /dev/null
+++ b/tests/wpt/mozilla/meta-legacy-layout/mozilla/worklets/test_paint_worklet.html.ini
@@ -0,0 +1,2 @@
+[test_paint_worklet.html]
+  expected: CRASH
diff --git a/tests/wpt/mozilla/meta-legacy-layout/mozilla/worklets/test_paint_worklet_size.html.ini b/tests/wpt/mozilla/meta-legacy-layout/mozilla/worklets/test_paint_worklet_size.html.ini
index e14795da114..806af6170ad 100644
--- a/tests/wpt/mozilla/meta-legacy-layout/mozilla/worklets/test_paint_worklet_size.html.ini
+++ b/tests/wpt/mozilla/meta-legacy-layout/mozilla/worklets/test_paint_worklet_size.html.ini
@@ -1,3 +1,3 @@
 [test_paint_worklet_size.html]
   type: reftest
-  expected: FAIL
+  expected: CRASH
diff --git a/tests/wpt/mozilla/meta-legacy-layout/mozilla/worklets/test_paint_worklet_timeout.html.ini b/tests/wpt/mozilla/meta-legacy-layout/mozilla/worklets/test_paint_worklet_timeout.html.ini
index b99ea5a3ee9..fce335ab932 100644
--- a/tests/wpt/mozilla/meta-legacy-layout/mozilla/worklets/test_paint_worklet_timeout.html.ini
+++ b/tests/wpt/mozilla/meta-legacy-layout/mozilla/worklets/test_paint_worklet_timeout.html.ini
@@ -1,3 +1,4 @@
 [test_paint_worklet_timeout.html]
   type: testharness
   prefs: [dom.worklet.timeout_ms:10]
+  expected: CRASH
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservo.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservo.py
index a8ec3869961..3250c74ff43 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservo.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorservo.py
@@ -83,6 +83,7 @@ class ServoTestharnessExecutor(ProcessTestExecutor):
         ProcessTestExecutor.teardown(self)
 
     def do_test(self, test):
+        self.test = test
         self.result_data = None
         self.result_flag = threading.Event()
 
@@ -156,7 +157,7 @@ class ServoTestharnessExecutor(ProcessTestExecutor):
             else:
                 self.logger.process_output(self.proc.pid,
                                            line,
-                                           " ".join(self.command))
+                                           " ".join(self.command), self.test.url)
 
     def on_finish(self):
         self.result_flag.set()
@@ -270,6 +271,7 @@ class ServoRefTestExecutor(ProcessTestExecutor):
                 return True, [base64.b64encode(data).decode()]
 
     def do_test(self, test):
+        self.test = test
         result = self.implementation.run_test(test)
 
         return self.convert_result(test, result)
@@ -281,7 +283,7 @@ class ServoRefTestExecutor(ProcessTestExecutor):
         else:
             self.logger.process_output(self.proc.pid,
                                        line,
-                                       " ".join(self.command))
+                                   " ".join(self.command), self.test.url)
 
 
 class ServoTimedRunner(TimedRunner):
@@ -342,21 +344,22 @@ class ServoCrashtestExecutor(ProcessTestExecutor):
         env["HOST_FILE"] = self.hosts_path
         env["RUST_BACKTRACE"] = "1"
 
-        command = build_servo_command(self.test,
-                                      self.test_url,
-                                      self.browser,
-                                      self.binary,
-                                      False,
-                                      self.debug_info,
-                                      extra_args=["-x"])
+        self.command = build_servo_command(self.test,
+                                           self.test_url,
+                                           self.browser,
+                                           self.binary,
+                                           False,
+                                           self.debug_info,
+                                           extra_args=["-x"])
 
         if not self.interactive:
-            self.proc = ProcessHandler(command,
+            self.proc = ProcessHandler(self.command,
                                        env=env,
+                                       processOutputLine=[self.on_output],
                                        storeOutput=False)
             self.proc.run()
         else:
-            self.proc = subprocess.Popen(command, env=env)
+            self.proc = subprocess.Popen(self.command, env=env)
 
         self.proc.wait()
 
@@ -364,3 +367,9 @@ class ServoCrashtestExecutor(ProcessTestExecutor):
             return {"status": "PASS", "message": None}
 
         return {"status": "CRASH", "message": None}
+
+    def on_output(self, line):
+        line = line.decode("utf8", "replace")
+        self.logger.process_output(self.proc.pid,
+                                   line,
+                                   " ".join(self.command), self.test.url)