diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs
index 8d5f0db0c0e..99abcf07e3d 100644
--- a/components/script/dom/bindings/trace.rs
+++ b/components/script/dom/bindings/trace.rs
@@ -29,6 +29,7 @@
 //! The `unsafe_no_jsmanaged_fields!()` macro adds an empty implementation of
 //! `JSTraceable` to a datatype.
 
+use std::cell::OnceCell;
 use std::collections::hash_map::RandomState;
 use std::collections::HashMap;
 use std::fmt::Display;
@@ -89,6 +90,12 @@ unsafe impl<T: CustomTraceable> CustomTraceable for DomRefCell<T> {
     }
 }
 
+unsafe impl<T: JSTraceable> CustomTraceable for OnceCell<T> {
+    unsafe fn trace(&self, tracer: *mut JSTracer) {
+        self.get().map(|value| value.trace(tracer));
+    }
+}
+
 /// Wrapper type for nop traceble
 ///
 /// SAFETY: Inner type must not impl JSTraceable
diff --git a/components/script/dom/worklet.rs b/components/script/dom/worklet.rs
index 17e6e7fa82d..e3f94d8e6ce 100644
--- a/components/script/dom/worklet.rs
+++ b/components/script/dom/worklet.rs
@@ -10,6 +10,7 @@
 //! thread pool implementation, which only performs GC or code loading on
 //! a backup thread, not on the primary worklet thread.
 
+use std::cell::OnceCell;
 use std::cmp::max;
 use std::collections::{hash_map, HashMap};
 use std::rc::Rc;
@@ -38,7 +39,7 @@ use crate::dom::bindings::refcounted::TrustedPromise;
 use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
 use crate::dom::bindings::root::{Dom, DomRoot, RootCollection, ThreadLocalStackRoots};
 use crate::dom::bindings::str::USVString;
-use crate::dom::bindings::trace::{JSTraceable, RootedTraceableBox};
+use crate::dom::bindings::trace::{CustomTraceable, JSTraceable, RootedTraceableBox};
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::promise::Promise;
 use crate::dom::testworkletglobalscope::TestWorkletTask;
@@ -60,12 +61,18 @@ const MIN_GC_THRESHOLD: u32 = 1_000_000;
 #[derive(JSTraceable, MallocSizeOf)]
 struct DroppableField {
     worklet_id: WorkletId,
+    /// The cached version of the script thread's WorkletThreadPool. We keep this cached
+    /// because we may need to access it after the script thread has terminated.
+    #[ignore_malloc_size_of = "Difficult to measure memory usage of Rc<...> types"]
+    thread_pool: OnceCell<Rc<WorkletThreadPool>>,
 }
 
 impl Drop for DroppableField {
     fn drop(&mut self) {
-        let script_thread = ScriptThread::worklet_thread_pool();
-        script_thread.exit_worklet(self.worklet_id);
+        let worklet_id = self.worklet_id;
+        self.thread_pool.get_mut().map(|thread_pool| {
+            thread_pool.exit_worklet(worklet_id);
+        });
     }
 }
 
@@ -86,6 +93,7 @@ impl Worklet {
             global_type: global_type,
             droppable_field: DroppableField {
                 worklet_id: WorkletId::new(),
+                thread_pool: OnceCell::new(),
             },
         }
     }
@@ -134,19 +142,21 @@ impl WorkletMethods for Worklet {
         // Steps 6-12 in parallel.
         let pending_tasks_struct = PendingTasksStruct::new();
         let global = self.window.upcast::<GlobalScope>();
-        let pool = ScriptThread::worklet_thread_pool();
 
-        pool.fetch_and_invoke_a_worklet_script(
-            global.pipeline_id(),
-            self.droppable_field.worklet_id,
-            self.global_type,
-            self.window.origin().immutable().clone(),
-            global.api_base_url(),
-            module_url_record,
-            options.credentials.clone(),
-            pending_tasks_struct,
-            &promise,
-        );
+        self.droppable_field
+            .thread_pool
+            .get_or_init(ScriptThread::worklet_thread_pool)
+            .fetch_and_invoke_a_worklet_script(
+                global.pipeline_id(),
+                self.droppable_field.worklet_id,
+                self.global_type,
+                self.window.origin().immutable().clone(),
+                global.api_base_url(),
+                module_url_record,
+                options.credentials.clone(),
+                pending_tasks_struct,
+                &promise,
+            );
 
         // Step 5.
         debug!("Returning promise.");
@@ -501,9 +511,14 @@ impl WorkletThread {
                 //       this total ordering on thread roles is what guarantees deadlock-freedom.
                 WorkletData::StartSwapRoles(sender) => {
                     let (our_swapper, their_swapper) = swapper();
-                    sender
-                        .send(WorkletData::FinishSwapRoles(their_swapper))
-                        .unwrap();
+                    match sender.send(WorkletData::FinishSwapRoles(their_swapper)) {
+                        Ok(_) => {},
+                        Err(_) => {
+                            // This might happen if the script thread shuts down while
+                            // waiting for the worklet to finish.
+                            return;
+                        },
+                    };
                     let _ = our_swapper.swap(&mut self.role);
                 },
                 // To finish swapping roles, perform the atomic swap.
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
index 58fc6a0d970..bbda3eb5c04 100644
--- 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
@@ -1,2 +1,2 @@
 [background-image-alpha.https.html]
-  expected: CRASH
+  expected: PASS
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
deleted file mode 100644
index 5105718061d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-multiple.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-image-multiple.https.html]
-  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-tiled.https.html.ini b/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-tiled.https.html.ini
index c53beb59870..10e6dc50956 100644
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-tiled.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-paint-api/background-image-tiled.https.html.ini
@@ -1,3 +1,3 @@
 [background-image-tiled.https.html]
   type: reftest
-  expected: CRASH
+  expected: FAIL
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
deleted file mode 100644
index 2026c53d4f8..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/background-repeat-x.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-repeat-x.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 1ae2581e041..2460e466ee2 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: CRASH
+  expected: FAIL
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
deleted file mode 100644
index 345acad1c69..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-001.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index c733b5aa509..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-002.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 724d0ee4c9c..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-001.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 3de2c084af5..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-002.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index b077acbc024..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-background-image-tiled-003.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index b06534035f2..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-001.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 83b4b2face5..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-002.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 06b91601f14..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-003.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index a7e0e8a5bf9..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-004.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 30ee29c89fc..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/geometry-border-image-005.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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 47eb89029a5..0531826fde8 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: CRASH
+  expected: FAIL
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 f24e9813505..3950118e711 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: CRASH
+  expected: FAIL
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 65354a69a37..7954ffb5449 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: CRASH
+  expected: FAIL
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
deleted file mode 100644
index 2a61eacfab3..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-constructor-error.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 50bbb286f63..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-paint-error.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 3cfc38c10fd..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/invalid-image-pending-script.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 4ed81cc06ad..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/non-registered-property-value.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 47dce433f71..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/overdraw.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
index db163b4c35f..0eba91a07d6 100644
--- 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
@@ -1,2 +1,2 @@
 [paint-arguments.https.html]
-  expected: CRASH
+  expected: PASS
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 d41dbc6c82a..b09f8785f58 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: CRASH
+  expected: FAIL
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
index 7d5d6e38be0..6fda875036d 100644
--- 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
@@ -1,2 +1,2 @@
 [paint-function-arguments.https.html]
-  expected: CRASH
+  expected: PASS
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
deleted file mode 100644
index c7e6ff24bbb..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint-function-this-value.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index fc8edae93dd..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-canvasFilter.tentative.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index d9f8adf47c3..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-composite.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index acbfdc97008..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-conicGradient.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
index 1378c3b32c5..6e335b8aa91 100644
--- 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
@@ -1,2 +1,2 @@
 [paint2d-filter.https.html]
-  expected: CRASH
+  expected: TIMEOUT
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
deleted file mode 100644
index fd273875788..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-gradient.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index bb15a16f2c2..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-image.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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 7fb82910fcc..fb29c86afa2 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
   bug: https://github.com/servo/servo/issues/17597
-  expected: CRASH
+  expected: FAIL
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
deleted file mode 100644
index c2741649c9d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-rects.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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 0b5d9be245f..91f2741e4c9 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: CRASH
+  expected: FAIL
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
deleted file mode 100644
index 718b843baaa..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-roundRect.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 111386c79a3..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-shadows.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 7e77a4b5239..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/paint2d-transform.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 8c575d90457..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-001.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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 29b61ebe7e6..86d08faea46 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,4 +1,3 @@
 [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 b611dd00c86..6262474d196 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,4 +1,3 @@
 [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
deleted file mode 100644
index 6a2fd730063..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-004.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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 d7c21139146..56c27026efc 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,4 +1,3 @@
 [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 395996e3e17..5329501fd03 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,4 +1,3 @@
 [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
deleted file mode 100644
index 48916610dd6..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-007.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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 3fe1da65bf9..0511e68318d 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,4 +1,3 @@
 [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 68b1e418480..ae92e1907f7 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,4 +1,3 @@
 [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 67d300f28dd..e9ca37a27e1 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,4 +1,3 @@
 [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 1040753e6a8..b6e0272ac24 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,4 +1,3 @@
 [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 a491061f09b..927fd4189bc 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,4 +1,3 @@
 [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
deleted file mode 100644
index 72a7814615a..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-013.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 9c740fade41..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-014.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 2da534683b5..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-015.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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 6723b5c1757..685d1f18027 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,4 +1,3 @@
 [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
deleted file mode 100644
index 96bfc090656..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-017.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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 5ee11a9c995..63f6daf4cf9 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: CRASH
+  expected: FAIL
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
deleted file mode 100644
index 63e16db6356..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-019.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 804459aec12..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-020.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index a8f25bcb50e..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-021.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 7d7eedf9102..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/parse-input-arguments-022.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index a699234f856..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/roundrect.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 376397625f8..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-001.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 184addaf0fa..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-002.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index 2bef72de0ef..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-003.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index cc9a70a21f0..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/setTransform-004.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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 73b213324cf..68e44c7adff 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
   bug: https://github.com/servo/servo/issues/17378
-  expected: CRASH
+  expected: FAIL
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 20081c8b1b5..ffc394d3523 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
   bug: https://github.com/servo/servo/issues/17854
-  expected: CRASH
+  expected: FAIL
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 ec9fb10ff97..13928f3491f 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
   bug: https://github.com/servo/servo/issues/17854
-  expected: CRASH
+  expected: FAIL
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
deleted file mode 100644
index d6133c8d50d..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/valid-image-after-load.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[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
deleted file mode 100644
index f04a20c9704..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-paint-api/valid-image-before-load.https.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[valid-image-before-load.https.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
index c7f59053c7a..6fa6babab73 100644
--- 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
@@ -1,2 +1,2 @@
 [test_paint_worklet.html]
-  expected: CRASH
+  expected: PASS
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 806af6170ad..e14795da114 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: CRASH
+  expected: FAIL
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 fce335ab932..bc2b728c300 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,4 +1,4 @@
 [test_paint_worklet_timeout.html]
   type: testharness
   prefs: [dom.worklet.timeout_ms:10]
-  expected: CRASH
+  expected: PASS