diff --git a/components/script/dom/css.rs b/components/script/dom/css.rs
index c78627b2e64..4b67f516e83 100644
--- a/components/script/dom/css.rs
+++ b/components/script/dom/css.rs
@@ -6,8 +6,10 @@ use cssparser::{Parser, ParserInput, serialize_identifier};
 use dom::bindings::codegen::Bindings::WindowBinding::WindowBinding::WindowMethods;
 use dom::bindings::error::Fallible;
 use dom::bindings::reflector::Reflector;
+use dom::bindings::root::DomRoot;
 use dom::bindings::str::DOMString;
 use dom::window::Window;
+use dom::worklet::Worklet;
 use dom_struct::dom_struct;
 use style::context::QuirksMode;
 use style::parser::ParserContext;
@@ -63,4 +65,9 @@ impl CSS {
             false
         }
     }
+
+    /// <https://drafts.css-houdini.org/css-paint-api-1/#paint-worklet>
+    pub fn PaintWorklet(win: &Window) -> DomRoot<Worklet> {
+        win.paint_worklet()
+    }
 }
diff --git a/components/script/dom/webidls/CSS.webidl b/components/script/dom/webidls/CSS.webidl
index 5f4aa4f0bef..02ed6b5074a 100644
--- a/components/script/dom/webidls/CSS.webidl
+++ b/components/script/dom/webidls/CSS.webidl
@@ -17,3 +17,8 @@ partial interface CSS {
   static boolean supports(DOMString property, DOMString value);
   static boolean supports(DOMString conditionText);
 };
+
+// https://drafts.css-houdini.org/css-paint-api-1/#paint-worklet
+partial interface CSS {
+    [SameObject, Pref="dom.worklet.enabled"] static readonly attribute Worklet paintWorklet;
+};
diff --git a/components/script/dom/webidls/Window.webidl b/components/script/dom/webidls/Window.webidl
index d6da05480cf..df20b6ced82 100644
--- a/components/script/dom/webidls/Window.webidl
+++ b/components/script/dom/webidls/Window.webidl
@@ -196,8 +196,3 @@ partial interface Window {
    readonly attribute TestRunner testRunner;
    //readonly attribute EventSender eventSender;
 };
-
-// https://drafts.css-houdini.org/css-paint-api-1/#paint-worklet
-partial interface Window {
-    [SameObject, Pref="dom.worklet.enabled"] readonly attribute Worklet paintWorklet;
-};
diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs
index 2e6fb487790..145b74ae8e3 100644
--- a/components/script/dom/window.rs
+++ b/components/script/dom/window.rs
@@ -1022,17 +1022,17 @@ impl WindowMethods for Window {
         fetch::Fetch(&self.upcast(), input, init)
     }
 
-    // https://drafts.css-houdini.org/css-paint-api-1/#paint-worklet
-    fn PaintWorklet(&self) -> DomRoot<Worklet> {
-        self.paint_worklet.or_init(|| self.new_paint_worklet())
-    }
-
     fn TestRunner(&self) -> DomRoot<TestRunner> {
         self.test_runner.or_init(|| TestRunner::new(self.upcast()))
     }
 }
 
 impl Window {
+    // https://drafts.css-houdini.org/css-paint-api-1/#paint-worklet
+    pub fn paint_worklet(&self) -> DomRoot<Worklet> {
+        self.paint_worklet.or_init(|| self.new_paint_worklet())
+    }
+
     pub fn task_canceller(&self) -> TaskCanceller {
         TaskCanceller {
             cancelled: Some(self.ignore_further_async_events.borrow().clone()),
diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini
index 0533630c35d..9daccd9d3f0 100644
--- a/tests/wpt/include.ini
+++ b/tests/wpt/include.ini
@@ -25,6 +25,8 @@ skip: true
     skip: false
   [css-images]
     skip: false
+  [css-paint-api]
+    skip: false
   [css-style-attr]
     skip: false
   [css-text]
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/__dir__.ini b/tests/wpt/metadata/css/css-paint-api/__dir__.ini
similarity index 100%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/__dir__.ini
rename to tests/wpt/metadata/css/css-paint-api/__dir__.ini
diff --git a/tests/wpt/metadata/css/css-paint-api/background-image-tiled.https.html.ini b/tests/wpt/metadata/css/css-paint-api/background-image-tiled.https.html.ini
new file mode 100644
index 00000000000..10e6dc50956
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/background-image-tiled.https.html.ini
@@ -0,0 +1,3 @@
+[background-image-tiled.https.html]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-001.html.ini b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-001.https.html.ini
similarity index 68%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-001.html.ini
rename to tests/wpt/metadata/css/css-paint-api/geometry-border-image-001.https.html.ini
index ece6c38a934..be79ff9381d 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-001.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-001.https.html.ini
@@ -1,4 +1,4 @@
-[geometry-border-image-001.html]
+[geometry-border-image-001.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17861
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-004.html.ini b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-002.https.html.ini
similarity index 68%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-004.html.ini
rename to tests/wpt/metadata/css/css-paint-api/geometry-border-image-002.https.html.ini
index 3fc2a3cef36..159e1221517 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-004.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-002.https.html.ini
@@ -1,4 +1,4 @@
-[geometry-border-image-004.html]
+[geometry-border-image-002.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17860
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-003.html.ini b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-003.https.html.ini
similarity index 68%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-003.html.ini
rename to tests/wpt/metadata/css/css-paint-api/geometry-border-image-003.https.html.ini
index f10a33a046b..36e1fa1632f 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-003.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-003.https.html.ini
@@ -1,4 +1,4 @@
-[geometry-border-image-003.html]
+[geometry-border-image-003.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17860
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-005.html.ini b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-004.https.html.ini
similarity index 68%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-005.html.ini
rename to tests/wpt/metadata/css/css-paint-api/geometry-border-image-004.https.html.ini
index 74f4df93abb..b39ba7c1aed 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-005.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/geometry-border-image-004.https.html.ini
@@ -1,4 +1,4 @@
-[geometry-border-image-005.html]
+[geometry-border-image-004.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17860
diff --git a/tests/wpt/metadata/css/css-paint-api/geometry-with-float-size.https.html.ini b/tests/wpt/metadata/css/css-paint-api/geometry-with-float-size.https.html.ini
new file mode 100644
index 00000000000..0531826fde8
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/geometry-with-float-size.https.html.ini
@@ -0,0 +1,3 @@
+[geometry-with-float-size.https.html]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/background-image-tiled.html.ini b/tests/wpt/metadata/css/css-paint-api/hidpi/device-pixel-ratio.https.html.ini
similarity index 50%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/background-image-tiled.html.ini
rename to tests/wpt/metadata/css/css-paint-api/hidpi/device-pixel-ratio.https.html.ini
index f988ff2fdbe..7954ffb5449 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/background-image-tiled.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/hidpi/device-pixel-ratio.https.html.ini
@@ -1,3 +1,3 @@
-[background-image-tiled.html]
+[device-pixel-ratio.https.html]
   type: reftest
   expected: FAIL
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-paths.html.ini b/tests/wpt/metadata/css/css-paint-api/paint2d-paths.https.html.ini
similarity index 75%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-paths.html.ini
rename to tests/wpt/metadata/css/css-paint-api/paint2d-paths.https.html.ini
index c1185a0f63f..49388848526 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-paths.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/paint2d-paths.https.html.ini
@@ -1,4 +1,4 @@
-[paint2d-paths.html]
+[paint2d-paths.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17597
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-002.html.ini b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-002.https.html.ini
similarity index 68%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-002.html.ini
rename to tests/wpt/metadata/css/css-paint-api/parse-input-arguments-002.https.html.ini
index 62235af2bed..d747392eb3b 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-002.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-002.https.html.ini
@@ -1,4 +1,4 @@
-[parse-input-arguments-002.html]
+[parse-input-arguments-002.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-003.html.ini b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-003.https.html.ini
similarity index 68%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-003.html.ini
rename to tests/wpt/metadata/css/css-paint-api/parse-input-arguments-003.https.html.ini
index 7f9510423eb..8c925cb0088 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-003.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-003.https.html.ini
@@ -1,4 +1,4 @@
-[parse-input-arguments-003.html]
+[parse-input-arguments-003.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-005.html.ini b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-005.https.html.ini
similarity index 68%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-005.html.ini
rename to tests/wpt/metadata/css/css-paint-api/parse-input-arguments-005.https.html.ini
index e6e779786ad..270647ca332 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-005.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-005.https.html.ini
@@ -1,4 +1,4 @@
-[parse-input-arguments-005.html]
+[parse-input-arguments-005.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-006.html.ini b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-006.https.html.ini
similarity index 68%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-006.html.ini
rename to tests/wpt/metadata/css/css-paint-api/parse-input-arguments-006.https.html.ini
index ae94f1f8a9c..eb77aa65f63 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-006.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-006.https.html.ini
@@ -1,4 +1,4 @@
-[parse-input-arguments-006.html]
+[parse-input-arguments-006.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-008.https.html.ini b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-008.https.html.ini
new file mode 100644
index 00000000000..773a2c4c43c
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-008.https.html.ini
@@ -0,0 +1,4 @@
+[parse-input-arguments-008.https.html]
+  type: reftest
+  expected: FAIL
+  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-009.https.html.ini b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-009.https.html.ini
new file mode 100644
index 00000000000..3e7ac7e9277
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-009.https.html.ini
@@ -0,0 +1,4 @@
+[parse-input-arguments-009.https.html]
+  type: reftest
+  expected: FAIL
+  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-010.https.html.ini b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-010.https.html.ini
new file mode 100644
index 00000000000..742b2ff5c26
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-010.https.html.ini
@@ -0,0 +1,4 @@
+[parse-input-arguments-010.https.html]
+  type: reftest
+  expected: FAIL
+  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-011.https.html.ini b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-011.https.html.ini
new file mode 100644
index 00000000000..6c51f66c0f7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-011.https.html.ini
@@ -0,0 +1,4 @@
+[parse-input-arguments-011.https.html]
+  type: reftest
+  expected: FAIL
+  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-012.https.html.ini b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-012.https.html.ini
new file mode 100644
index 00000000000..056507d65af
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-012.https.html.ini
@@ -0,0 +1,4 @@
+[parse-input-arguments-012.https.html]
+  type: reftest
+  expected: FAIL
+  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-016.https.html.ini b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-016.https.html.ini
new file mode 100644
index 00000000000..1ba90f98ec4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-016.https.html.ini
@@ -0,0 +1,4 @@
+[parse-input-arguments-016.https.html]
+  type: reftest
+  expected: FAIL
+  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-018.https.html.ini b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-018.https.html.ini
new file mode 100644
index 00000000000..63f6daf4cf9
--- /dev/null
+++ b/tests/wpt/metadata/css/css-paint-api/parse-input-arguments-018.https.html.ini
@@ -0,0 +1,3 @@
+[parse-input-arguments-018.https.html]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/registered-properties-in-custom-paint.html.ini b/tests/wpt/metadata/css/css-paint-api/registered-properties-in-custom-paint.https.html.ini
similarity index 63%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/registered-properties-in-custom-paint.html.ini
rename to tests/wpt/metadata/css/css-paint-api/registered-properties-in-custom-paint.https.html.ini
index de433dc1642..b7f1cc0798b 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/registered-properties-in-custom-paint.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/registered-properties-in-custom-paint.https.html.ini
@@ -1,4 +1,4 @@
-[registered-properties-in-custom-paint.html]
+[registered-properties-in-custom-paint.https.html]
   type: reftest
   expected: TIMEOUT
   bug: https://github.com/servo/servo/issues/17677
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/style-background-image.html.ini b/tests/wpt/metadata/css/css-paint-api/style-background-image.https.html.ini
similarity index 70%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/style-background-image.html.ini
rename to tests/wpt/metadata/css/css-paint-api/style-background-image.https.html.ini
index b5b74284aa0..56669e8c173 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/style-background-image.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/style-background-image.https.html.ini
@@ -1,4 +1,4 @@
-[style-background-image.html]
+[style-background-image.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17378
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/style-before-pseudo.html.ini b/tests/wpt/metadata/css/css-paint-api/style-before-pseudo.https.html.ini
similarity index 71%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/style-before-pseudo.html.ini
rename to tests/wpt/metadata/css/css-paint-api/style-before-pseudo.https.html.ini
index 8e3e18c50ad..a262749dfc9 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/style-before-pseudo.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/style-before-pseudo.https.html.ini
@@ -1,4 +1,4 @@
-[style-before-pseudo.html]
+[style-before-pseudo.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17854
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/style-first-letter-pseudo.html.ini b/tests/wpt/metadata/css/css-paint-api/style-first-letter-pseudo.https.html.ini
similarity index 68%
rename from tests/wpt/mozilla/meta/mozilla/css-paint-api/style-first-letter-pseudo.html.ini
rename to tests/wpt/metadata/css/css-paint-api/style-first-letter-pseudo.https.html.ini
index 55518de2716..5a7400be26d 100644
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/style-first-letter-pseudo.html.ini
+++ b/tests/wpt/metadata/css/css-paint-api/style-first-letter-pseudo.https.html.ini
@@ -1,4 +1,4 @@
-[style-first-letter-pseudo.html]
+[style-first-letter-pseudo.https.html]
   type: reftest
   expected: FAIL
   bug: https://github.com/servo/servo/issues/17854
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index f8a55cc49d5..3e7f2673696 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -6857,630 +6857,6 @@
      {}
     ]
    ],
-   "mozilla/css-paint-api/background-image-alpha.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/background-image-alpha.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/background-image-alpha-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/background-image-multiple.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/background-image-multiple.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/background-image-multiple-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/background-image-tiled.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/background-image-tiled.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/background-image-tiled-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-001.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/geometry-background-image-001.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/geometry-background-image-001-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-002.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/geometry-background-image-002.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/geometry-background-image-002-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-003.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/geometry-background-image-003.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/geometry-background-image-003-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-tiled-001.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/geometry-background-image-tiled-001.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/geometry-background-image-tiled-001-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-tiled-002.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/geometry-background-image-tiled-002.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/geometry-background-image-tiled-002-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-tiled-003.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/geometry-background-image-tiled-003.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/geometry-background-image-tiled-003-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-border-image-001.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/geometry-border-image-001.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/geometry-border-image-001-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-border-image-002.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/geometry-border-image-002.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/geometry-border-image-002-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-border-image-003.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/geometry-border-image-003.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/geometry-border-image-003-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-border-image-004.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/geometry-border-image-004.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/geometry-border-image-004-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-border-image-005.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/geometry-border-image-005.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/geometry-border-image-005-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/invalid-image-constructor-error.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/invalid-image-constructor-error.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/invalid-image-constructor-error-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/invalid-image-paint-error.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/invalid-image-paint-error.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/invalid-image-paint-error-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/invalid-image-pending-script.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/invalid-image-pending-script.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/invalid-image-pending-script-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/overdraw.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/overdraw.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/overdraw-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint-arguments.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/paint-arguments.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/paint-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint-function-arguments.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/paint-function-arguments.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/paint-function-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-composite.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/paint2d-composite.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/paint2d-composite-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-filter.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/paint2d-filter.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/paint2d-filter-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-gradient.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/paint2d-gradient.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/paint2d-gradient-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-image.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/paint2d-image.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/paint2d-image-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-paths.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/paint2d-paths.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/paint2d-paths-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-rects.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/paint2d-rects.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/paint2d-rects-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-shadows.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/paint2d-shadows.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/paint2d-shadows-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-transform.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/paint2d-transform.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/paint2d-transform-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-zoom.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/paint2d-zoom.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/paint2d-zoom-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-001.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-001.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-002.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-002.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-003.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-003.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-004.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-004.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-005.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-005.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-006.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-006.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-007.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-007.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-008.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-008.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-009.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-009.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-010.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-010.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-011.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-011.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-012.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-012.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-013.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-013.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-014.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-014.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-015.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-015.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-016.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-016.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-017.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/parse-input-arguments-017.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/registered-properties-in-custom-paint.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/registered-properties-in-custom-paint.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/parse-input-arguments-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/style-background-image.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/style-background-image.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/style-background-image-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/style-before-pseudo.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/style-before-pseudo.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/style-before-pseudo-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/style-first-letter-pseudo.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/style-first-letter-pseudo.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/style-first-letter-pseudo-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/valid-image-after-load.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/valid-image-after-load.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/valid-image-after-load-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/valid-image-before-load.html": [
-    [
-     "/_mozilla/mozilla/css-paint-api/valid-image-before-load.html",
-     [
-      [
-       "/_mozilla/mozilla/css-paint-api/valid-image-before-load-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "mozilla/details_ui_closed.html": [
     [
      "/_mozilla/mozilla/details_ui_closed.html",
@@ -10835,196 +10211,6 @@
      {}
     ]
    ],
-   "mozilla/css-paint-api/OWNERS": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/background-image-alpha-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/background-image-multiple-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/background-image-tiled-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/css-paint-tests.js": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-001-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-002-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-003-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-tiled-001-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-tiled-002-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-background-image-tiled-003-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-border-image-001-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-border-image-002-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-border-image-003-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-border-image-004-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/geometry-border-image-005-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/invalid-image-constructor-error-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/invalid-image-paint-error-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/invalid-image-pending-script-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/overdraw-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint-arguments-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint-function-arguments-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-composite-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-filter-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-gradient-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-image-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-paths-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-rects-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-shadows-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-transform-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/paint2d-zoom-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/parse-input-arguments-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/resources/html5.png": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/style-background-image-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/style-before-pseudo-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/style-first-letter-pseudo-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/valid-image-after-load-ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/css-paint-api/valid-image-before-load-ref.html": [
-    [
-     {}
-    ]
-   ],
    "mozilla/details_ui_closed_ref.html": [
     [
      {}
@@ -65552,366 +64738,6 @@
    "0163758c92997c6723c9d21be49ef7f51d8b3daf",
    "testharness"
   ],
-  "mozilla/css-paint-api/OWNERS": [
-   "0c1517f7ba747014c7c091b61d48f11421ed91c2",
-   "support"
-  ],
-  "mozilla/css-paint-api/background-image-alpha-ref.html": [
-   "45ef6e998e5f266741f5403df650cd9557dbe005",
-   "support"
-  ],
-  "mozilla/css-paint-api/background-image-alpha.html": [
-   "ec35a42013e36c05a26266f0f78a16283acc843d",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/background-image-multiple-ref.html": [
-   "9ff536499d72240f67eb6911b768c624371ea678",
-   "support"
-  ],
-  "mozilla/css-paint-api/background-image-multiple.html": [
-   "f8c286926ccf981713eb34259e3f5389bf3c37f6",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/background-image-tiled-ref.html": [
-   "a879be73470aae683bd7596132225770bc8be27b",
-   "support"
-  ],
-  "mozilla/css-paint-api/background-image-tiled.html": [
-   "4c7b8e525a909cbc38a2ad0b6a44a803595b6772",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/css-paint-tests.js": [
-   "0e88a610e5ad9ff1deb04adec35b73caadbff201",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-001-ref.html": [
-   "bca138ca3ce5b6dee10f935fd2ff9756d18b12ef",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-001.html": [
-   "042380a14db00ace100393719f74e8864d16c6cd",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-002-ref.html": [
-   "4d33168e6298c1ed7d44ff431791615cdaf9038f",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-002.html": [
-   "fd962b9a8f7645615a0dbb3dc247e0d408060c9c",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-003-ref.html": [
-   "e5b4098a1f1b9aab0a27c7bdae0532db4dc26a92",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-003.html": [
-   "bb1f458f7672995804e0e1565aa5a78d5d3527c2",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-tiled-001-ref.html": [
-   "df994fa58244f5e8d4b4aac7f0ad335fe8570dcc",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-tiled-001.html": [
-   "bfe687843bcc155746ded14983f0cd1fc956ff66",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-tiled-002-ref.html": [
-   "c5363f4f7843ff8025ae5457524c0c9f4aac144c",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-tiled-002.html": [
-   "6b33b4456f3e91f0867aaacd68a842b10fbbbd08",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-tiled-003-ref.html": [
-   "d4f9428be3b8f9003eb9373b3eb87ebed0c55c15",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-background-image-tiled-003.html": [
-   "728cb8ad6268a57d8729588648d9d68ffc685073",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/geometry-border-image-001-ref.html": [
-   "81026e756ea8e3be653e176c09f1762507915cb8",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-border-image-001.html": [
-   "3e45991eaddb310c517cb804ff2511150b12fbda",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/geometry-border-image-002-ref.html": [
-   "076c1f3e3b5cfd3a434e94f33872f5f598a7225b",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-border-image-002.html": [
-   "37ebb2c728fe88bbd8745050b573e2ca0c3f865c",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/geometry-border-image-003-ref.html": [
-   "141bf94dcd935420b95ee4da52139bf51318196d",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-border-image-003.html": [
-   "d29cfb4fb9895ef72dc281c55be2cf356a7259a5",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/geometry-border-image-004-ref.html": [
-   "d730b44bd1020305b70da095a15f9a4f7e9f262a",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-border-image-004.html": [
-   "09219c8985bb2f66682a6df393ecfcf283978ac3",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/geometry-border-image-005-ref.html": [
-   "b401ed261976a4acd2408a84fda9d63d27d1c3a4",
-   "support"
-  ],
-  "mozilla/css-paint-api/geometry-border-image-005.html": [
-   "83efcbdc5e2cd1850ea4c490b6c7e7327f329923",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/invalid-image-constructor-error-ref.html": [
-   "b0c34ee1480fe1108fe8dc53f2bbb2f3ffa1c408",
-   "support"
-  ],
-  "mozilla/css-paint-api/invalid-image-constructor-error.html": [
-   "694efcb525fed448cc757cff38ec034dad9cdb3c",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/invalid-image-paint-error-ref.html": [
-   "b0c34ee1480fe1108fe8dc53f2bbb2f3ffa1c408",
-   "support"
-  ],
-  "mozilla/css-paint-api/invalid-image-paint-error.html": [
-   "3b0e6a034f3edbde6d30ad9483a50fbea0ab48bd",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/invalid-image-pending-script-ref.html": [
-   "b0c34ee1480fe1108fe8dc53f2bbb2f3ffa1c408",
-   "support"
-  ],
-  "mozilla/css-paint-api/invalid-image-pending-script.html": [
-   "54a69d6d408e77bf2e91ee09564d62c8d16d1eb3",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/overdraw-ref.html": [
-   "b0c34ee1480fe1108fe8dc53f2bbb2f3ffa1c408",
-   "support"
-  ],
-  "mozilla/css-paint-api/overdraw.html": [
-   "a2d730dbd6faefbd8bbd07d33f6942f6573b842e",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/paint-arguments-ref.html": [
-   "cbe0372259011ca94f0fd8d233413439ba9cf117",
-   "support"
-  ],
-  "mozilla/css-paint-api/paint-arguments.html": [
-   "2807e0bc8b2e8aa9e5edf69f9de3e8d4ee853ef9",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/paint-function-arguments-ref.html": [
-   "a3aebfce59d0f62ab229248b7903b0dc731835d5",
-   "support"
-  ],
-  "mozilla/css-paint-api/paint-function-arguments.html": [
-   "f3c461e7e5797d3b65058109ffc58b6c95e1a340",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/paint2d-composite-ref.html": [
-   "60c069de8135b934df166560db5c592d5becbc92",
-   "support"
-  ],
-  "mozilla/css-paint-api/paint2d-composite.html": [
-   "f9d0cceb6360cbdf3478673740ecfbe67a4a11d2",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/paint2d-filter-ref.html": [
-   "6f1be576ae7ead2a724357b16ea88c92b3b19a0d",
-   "support"
-  ],
-  "mozilla/css-paint-api/paint2d-filter.html": [
-   "c266200a6a990b5b23e6f9d5859f8f5c4c271be8",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/paint2d-gradient-ref.html": [
-   "3b2abb3632893c0f5a2714fc325467f0076001a8",
-   "support"
-  ],
-  "mozilla/css-paint-api/paint2d-gradient.html": [
-   "6cf101de7a3aa627cb372f00eeb36e969ff25734",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/paint2d-image-ref.html": [
-   "c71e0b960177b13614d2c11392c94ea155927ebe",
-   "support"
-  ],
-  "mozilla/css-paint-api/paint2d-image.html": [
-   "769d066054b6cabb77ed3f958d52bfdb17e99b8d",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/paint2d-paths-ref.html": [
-   "cf154ab8a37bdbce2175193dfc456f4771bfeca8",
-   "support"
-  ],
-  "mozilla/css-paint-api/paint2d-paths.html": [
-   "8f98b1d34bb3719b5e337f279adbe63fc6c122fd",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/paint2d-rects-ref.html": [
-   "2a469427fbdbee6b096a63b95846cdeda92c0255",
-   "support"
-  ],
-  "mozilla/css-paint-api/paint2d-rects.html": [
-   "e2e82b82b28af9e509a9eabf48f728dbe06b0d18",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/paint2d-shadows-ref.html": [
-   "f882c26b0dfb58fe1ab3177060f421dad0148456",
-   "support"
-  ],
-  "mozilla/css-paint-api/paint2d-shadows.html": [
-   "7ca525ddfa56a8571857a8656e6bed38c440705a",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/paint2d-transform-ref.html": [
-   "5eff507eeee563399205645668c7ed3df79213c9",
-   "support"
-  ],
-  "mozilla/css-paint-api/paint2d-transform.html": [
-   "e4b544068821f6f8882f05836a07a19891fc85b8",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/paint2d-zoom-ref.html": [
-   "37354f2479a070eadd2a571ff6207953cad3597d",
-   "support"
-  ],
-  "mozilla/css-paint-api/paint2d-zoom.html": [
-   "00c20556fef8169662a4e230e10c0952ab4bfa42",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-001.html": [
-   "5afe3f03b880000bb94803cb2a6eee8d423f5d68",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-002.html": [
-   "ba0f7dd2398ab0e786792b83eec77e3dda297ece",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-003.html": [
-   "9170929ec7d55285884701d8b18abe53ce1114e3",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-004.html": [
-   "5feae438f32bb77d58431b7958f31afde4c73ba9",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-005.html": [
-   "106cf8d73dad4355d5184b1306d2ba8b92ef55ec",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-006.html": [
-   "018090e38d8354d9ebfceecdfee315e6f069aaaa",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-007.html": [
-   "58f132ed442b4e6385436e60ba809f3ce36444c2",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-008.html": [
-   "68c0f9c8b91ec1fc42a1599d7af2cff1bf8ecf33",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-009.html": [
-   "c8c5ad5eb83db204ff0ba1c3747626ba252297f5",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-010.html": [
-   "9c4e808e6b52cdfc595227c2a1b17a1bd458073a",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-011.html": [
-   "32d14db912ad9a267b5f879a3b3574eec7e0a591",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-012.html": [
-   "ed8c9c408d7dee8e4315305e736a58766fe06575",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-013.html": [
-   "06ca97c7addc23faeeb929a927c9065101a90410",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-014.html": [
-   "0d899ca87aad315a5d59a506dc2ea306d0a32504",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-015.html": [
-   "2e4b898ff93047ef399450a762a152d05a63fd21",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-016.html": [
-   "fa390361d9f0237401c3fcee13ed44bd386d3a8f",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-017.html": [
-   "4e540c471f67e6e3554fcb436833ba80fe868cc8",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/parse-input-arguments-ref.html": [
-   "6133bd65ef569456f58f1e501d81e088256bdc0a",
-   "support"
-  ],
-  "mozilla/css-paint-api/registered-properties-in-custom-paint.html": [
-   "c33bf95ab3196bb958c3ddbb08b73792a5cacae7",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/resources/html5.png": [
-   "83ef56b6e4d0dcb0d2dcecfb3fc78035051e8627",
-   "support"
-  ],
-  "mozilla/css-paint-api/style-background-image-ref.html": [
-   "0985e20363c8aac715c534ad59f1209889244fb0",
-   "support"
-  ],
-  "mozilla/css-paint-api/style-background-image.html": [
-   "02a66fa36821edd082de0d0752f304960837fd07",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/style-before-pseudo-ref.html": [
-   "6dcbe78ab89343178e18e3e92744b25759ec8241",
-   "support"
-  ],
-  "mozilla/css-paint-api/style-before-pseudo.html": [
-   "e6b43224b40bca0703faccd7eb2688ca7cbea255",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/style-first-letter-pseudo-ref.html": [
-   "c6a94e5bafa098b8f4023312db97abebe992abc3",
-   "support"
-  ],
-  "mozilla/css-paint-api/style-first-letter-pseudo.html": [
-   "7f9ccf3429a327c4fdbde077d0fb4c61438d198d",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/valid-image-after-load-ref.html": [
-   "b0c34ee1480fe1108fe8dc53f2bbb2f3ffa1c408",
-   "support"
-  ],
-  "mozilla/css-paint-api/valid-image-after-load.html": [
-   "4f20acb987ed51fc374d873db74522ed4bd1dc1c",
-   "reftest"
-  ],
-  "mozilla/css-paint-api/valid-image-before-load-ref.html": [
-   "b0c34ee1480fe1108fe8dc53f2bbb2f3ffa1c408",
-   "support"
-  ],
-  "mozilla/css-paint-api/valid-image-before-load.html": [
-   "67d8cdd3e3a1656ba315fcbf6dae7236680bac16",
-   "reftest"
-  ],
   "mozilla/custom_auto_rooter.html": [
    "3466095fb0846b848c948dd1596764fff456fa9b",
    "testharness"
@@ -72133,7 +70959,7 @@
    "support"
   ],
   "mozilla/worklets/test_paint_worklet.html": [
-   "67fccbde17c28e13b5f4dc54d70b1279d6e9d602",
+   "582287f9808afef465529e9fd80deadf10715868",
    "reftest"
   ],
   "mozilla/worklets/test_paint_worklet.js": [
@@ -72153,7 +70979,7 @@
    "support"
   ],
   "mozilla/worklets/test_paint_worklet_loading.html": [
-   "20fef90b09fdf8dfb5e7461a01c8bd0f7e5d31af",
+   "753dee7a328c99a42f4e6e46719a02fb9e179a09",
    "testharness"
   ],
   "mozilla/worklets/test_paint_worklet_no_paint.js": [
@@ -72177,7 +71003,7 @@
    "support"
   ],
   "mozilla/worklets/test_paint_worklet_size.html": [
-   "6ddcf8ad81eaf4a5112de39a87cbd3d290fd9ab4",
+   "eba8c08b2b1fe1992772c01a1b85e709fa580bbc",
    "reftest"
   ],
   "mozilla/worklets/test_paint_worklet_size.js": [
@@ -72189,7 +71015,7 @@
    "support"
   ],
   "mozilla/worklets/test_paint_worklet_timeout.html": [
-   "dde3d2d6359d39282cf8dfdfabebed735c7815a8",
+   "9ff9ce5392fd214f2939b26ede875ec74c4abfdd",
    "reftest"
   ],
   "mozilla/worklets/test_paint_worklet_timeout.js": [
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-background-image-003.html.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-background-image-003.html.ini
deleted file mode 100644
index 3456082d906..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-background-image-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[geometry-background-image-003.html]
-  type: reftest
-  expected: FAIL
-  bug: https://github.com/w3c/web-platform-tests/issues/6601
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-002.html.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-002.html.ini
deleted file mode 100644
index 5616793e307..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/geometry-border-image-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[geometry-border-image-002.html]
-  type: reftest
-  expected: FAIL
-  bug: https://github.com/servo/servo/issues/17860
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-zoom.html.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-zoom.html.ini
deleted file mode 100644
index 2e2c7da2351..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/paint2d-zoom.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[paint2d-zoom.html]
-  type: reftest
-  expected: FAIL
-  bug: https://github.com/w3c/web-platform-tests/issues/6610
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-008.html.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-008.html.ini
deleted file mode 100644
index d98d019bdf6..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-008.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[parse-input-arguments-008.html]
-  type: reftest
-  expected: FAIL
-  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-009.html.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-009.html.ini
deleted file mode 100644
index fcf29006fb5..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-009.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[parse-input-arguments-009.html]
-  type: reftest
-  expected: FAIL
-  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-010.html.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-010.html.ini
deleted file mode 100644
index e33e2a45e2d..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-010.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[parse-input-arguments-010.html]
-  type: reftest
-  expected: FAIL
-  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-011.html.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-011.html.ini
deleted file mode 100644
index f75167a90d9..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-011.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[parse-input-arguments-011.html]
-  type: reftest
-  expected: FAIL
-  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-012.html.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-012.html.ini
deleted file mode 100644
index cb2edbc3677..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-012.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[parse-input-arguments-012.html]
-  type: reftest
-  expected: FAIL
-  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-016.html.ini b/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-016.html.ini
deleted file mode 100644
index a6a654a478f..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/css-paint-api/parse-input-arguments-016.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[parse-input-arguments-016.html]
-  type: reftest
-  expected: FAIL
-  bug: https://github.com/servo/servo/issues/17852
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/OWNERS b/tests/wpt/mozilla/tests/mozilla/css-paint-api/OWNERS
deleted file mode 100644
index bd72a2a78f7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-@bfgeek
-@grorg
-@shans
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-alpha-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-alpha-ref.html
deleted file mode 100644
index 519b3599e95..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-alpha-ref.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-#background {
-  background-color: yellow;
-  display: inline-block;
-}
-
-.container {
-  font-size: 0px;
-}
-</style>
-</head>
-<body>
-
-<div id="background">
-  <div class="container">
-    <canvas id ="opaque" width="100" height="100"></canvas>
-  </div>
-  <div class="container">
-    <canvas id ="nonopaque" width="100" height="100"></canvas>
-  </div>
-</div>
-
-<script>
-function drawCanvas(canvasID, hasAlpha) {
-  var canvas = document.getElementById(canvasID);
-  var context = canvas.getContext("2d", {alpha: hasAlpha});
-  context.clearRect(0, 0, canvas.width, canvas.height);
-  context.strokeStyle = 'blue';
-  context.lineWidth = 4;
-  context.strokeRect(20, 20, 60, 60);
-};
-
-drawCanvas('opaque', false);
-drawCanvas('nonopaque', true);
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-alpha.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-alpha.html
deleted file mode 100644
index 929483e515b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-alpha.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="background-image-alpha-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-opaque {
-  background-image: paint(opaque);
-}
-
-#canvas-nonopaque {
-  background-image: paint(nonOpaque);
-}
-
-#background {
-  background-color: yellow;
-  display: inline-block;
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="background">
-  <div id="canvas-opaque" class="container"></div>
-  <div id="canvas-nonopaque" class="container"></div>
-</div>
-
-<script id="code" type="text/worklet">
-registerPaint('opaque', class {
-    static get alpha() { return false; }
-    paint(ctx, geom) {
-        ctx.strokeStyle = 'blue';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(20, 20, 60, 60);
-    }
-});
-
-registerPaint('nonOpaque', class {
-    static get alpha() { return true; }
-    paint(ctx, geom) {
-        ctx.strokeStyle = 'blue';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(20, 20, 60, 60);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-multiple-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-multiple-ref.html
deleted file mode 100644
index 536258be74c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-multiple-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<canvas id ="output" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById('output');
-var ctx = canvas.getContext('2d');
-
-var colors = ['red', 'green', 'blue'];
-for (var i = 2; i >= 0; i--) {
-    ctx.fillStyle = colors[i];
-    ctx.fillRect(i * 20, i * 20, 40, 40);
-}
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-multiple.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-multiple.html
deleted file mode 100644
index ea887018f80..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-multiple.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="background-image-multiple-ref.html">
-<style>
-    #output {
-        width: 100px;
-        height: 100px;
-        background-image: paint(n0), paint(n1), paint(n2);
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-var colors = ['red', 'green', 'blue'];
-
-for (let i = 0; i < 3; i++) {
-    registerPaint('n' + i, class {
-        paint(ctx, geom) {
-            ctx.fillStyle = colors[i];
-            ctx.fillRect(i * 20, i * 20, 40, 40);
-        }
-    });
-}
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-tiled-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-tiled-ref.html
deleted file mode 100644
index a0151d84cba..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-tiled-ref.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<canvas id ="one" width="100" height="100"></canvas>
-<canvas id ="two" width="100" height="100"></canvas>
-<script>
-function drawCircle(ctx, geom) {
-    var x = geom.width / 2;
-    var y = geom.height / 2;
-
-    ctx.fillStyle = 'green';
-    ctx.beginPath();
-    ctx.ellipse(x, y, x - 1, y - 1, 0, 0, 2 * Math.PI);
-    ctx.fill();
-}
-
-var ctx1 = document.getElementById('one').getContext('2d');
-drawCircle(ctx1, {width: 50, height: 50});
-ctx1.translate(50, 0);
-drawCircle(ctx1, {width: 50, height: 50});
-ctx1.resetTransform();
-ctx1.translate(0, 50);
-drawCircle(ctx1, {width: 100, height: 50});
-
-var ctx2 = document.getElementById('two').getContext('2d');
-for (var i = 0; i < 5; i++) {
-    drawCircle(ctx2, {width: 50, height: 20});
-    ctx2.translate(0, 20);
-}
-ctx2.resetTransform();
-ctx2.translate(50, 25);
-drawCircle(ctx2, {width: 50, height: 50});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-tiled.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-tiled.html
deleted file mode 100644
index 2ac3a11c6a6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/background-image-tiled.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="background-image-tiled-ref.html">
-<style>
-    div {
-        display: inline-block;
-        width: 100px;
-        height: 100px;
-    }
-
-    #one {
-        background:
-            paint(ellipse) top left/50% 50% repeat-x,
-            paint(ellipse) bottom left/100% 50% no-repeat;
-    }
-
-    #two {
-        background:
-            paint(ellipse) top left/50% 20% repeat-y,
-            paint(ellipse) center right/50% 50% no-repeat;
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="one"></div>
-<div id="two"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('ellipse', class {
-    paint(ctx, geom) {
-        var x = geom.width / 2;
-        var y = geom.height / 2;
-
-        ctx.fillStyle = 'green';
-        ctx.beginPath();
-        ctx.ellipse(x, y, x - 1, y - 1, 0, 0, 2 * Math.PI);
-        ctx.fill();
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/css-paint-tests.js b/tests/wpt/mozilla/tests/mozilla/css-paint-api/css-paint-tests.js
deleted file mode 100644
index 58a8e649ee1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/css-paint-tests.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// To make sure that we take the snapshot at the right time, we do double
-// requestAnimationFrame. In the second frame, we take a screenshot, that makes
-// sure that we already have a full frame.
-function importPaintWorkletAndTerminateTestAfterAsyncPaint(code) {
-    if (typeof paintWorklet == "undefined") {
-        takeScreenshot();
-    } else {
-        var blob = new Blob([code], {type: 'text/javascript'});
-        paintWorklet.addModule(URL.createObjectURL(blob)).then(function() {
-            requestAnimationFrame(function() {
-                requestAnimationFrame(function() {
-                    takeScreenshot();
-                });
-            });
-        });
-    }
-}
-
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-001-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-001-ref.html
deleted file mode 100644
index 83edae100ee..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-001-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<canvas id ="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-context.strokeStyle = 'green';
-context.lineWidth = 4;
-context.strokeRect(0, 0, 100, 100);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-001.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-001.html
deleted file mode 100644
index 7c2800c3c5b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-001.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="geometry-background-image-001-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        ctx.strokeStyle = 'green';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-002-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-002-ref.html
deleted file mode 100644
index ab964dbf8d7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-002-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<canvas id ="canvas" width="200" height="200"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-context.strokeStyle = 'green';
-context.lineWidth = 4;
-context.strokeRect(0, 0, 200, 200);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-002.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-002.html
deleted file mode 100644
index fc7990e7260..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-002.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="geometry-background-image-002-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-.container {
-  width: 200px;
-  height: 200px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        ctx.strokeStyle = 'green';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-003-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-003-ref.html
deleted file mode 100644
index ffdc4e84710..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-003-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<canvas id ="canvas" width="200" height="200" style="position:relative;"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-context.strokeStyle = 'green';
-context.lineWidth = 8;
-context.strokeRect(0, 0, 200, 200);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-003.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-003.html
deleted file mode 100644
index ce23b6cf6f3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-003.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="geometry-background-image-003-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        ctx.strokeStyle = 'green';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    document.body.style.zoom = "200%"
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-001-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-001-ref.html
deleted file mode 100644
index 9f633a93c0f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-001-ref.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<canvas id ="canvas" width="100" height="50"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-context.strokeStyle = 'green';
-context.lineWidth = 4;
-context.strokeRect(0, 0, 50, 50);
-context.strokeRect(50, 0, 50, 50);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-001.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-001.html
deleted file mode 100644
index 97eb2984245..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-001.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="geometry-background-image-tiled-001-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-.container {
-  width: 100px;
-  height: 100px;
-  background: paint(geometry) top left/50% 50% repeat-x;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        ctx.strokeStyle = 'green';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-002-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-002-ref.html
deleted file mode 100644
index f3c65e6776d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-002-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<canvas id ="canvas" width="50" height="20" style="position:relative; top:40px; left:50px"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-context.strokeStyle = 'green';
-context.lineWidth = 4;
-context.strokeRect(0, 0, 50, 20);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-002.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-002.html
deleted file mode 100644
index 1ded964a4d4..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-002.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="geometry-background-image-tiled-002-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-.container {
-  width: 100px;
-  height: 100px;
-  background: paint(geometry) center right/50% 20% no-repeat;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        ctx.strokeStyle = 'green';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-003-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-003-ref.html
deleted file mode 100644
index 8e1eb027658..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-003-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<canvas id ="canvas" width="60" height="80" style="position:relative; top:10px; left:20px"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-context.strokeStyle = 'green';
-context.lineWidth = 4;
-context.strokeRect(0, 0, 60, 80);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-003.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-003.html
deleted file mode 100644
index 13aa5b6ab62..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-background-image-tiled-003.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="geometry-background-image-tiled-003-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-.container {
-  width: 100px;
-  height: 100px;
-  background: paint(geometry) center center/60px 80px no-repeat;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        ctx.strokeStyle = 'green';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-001-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-001-ref.html
deleted file mode 100644
index bb0aa409374..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-001-ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<canvas id ="canvas" width="200" height="200" style="position:relative; top:10px; left:10px"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-// The test geometry-border-image1.html has a paint canvas with width=200 and
-// height=200, as well as a border-width=10 and border-image-slice: fill. All of
-// them combined meaning that it draws to the (200+10*2)*(200+10*2) area, but
-// stretch it to fit into the 200*200 area.
-// So in this ref test, we create a 200*200 canvas. We draw to a 220*220 area
-// and scale it to fit the 200*200 canvas.
-context.scale(200/220, 200/220);
-context.strokeStyle = 'green';
-context.lineWidth = 4;
-context.strokeRect(0, 0, 220, 220);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-001.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-001.html
deleted file mode 100644
index 870139b5307..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-001.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="geometry-border-image-001-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-.container {
-  width: 200px;
-  height: 200px;
-}
-
-#canvas-geometry {
-  border: solid 0;
-  border-image: paint(geometry);
-  border-image-slice: 0 fill;
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (geom.width == 220 && geom.height == 220)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    document.getElementById('canvas-geometry').style.borderWidth = '10px';
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-002-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-002-ref.html
deleted file mode 100644
index 0eb84ec0400..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-002-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<canvas id ="canvas" width="90" height="90" style="position:relative; left:-20px; top:-20px"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-context.strokeStyle = 'green';
-context.lineWidth = 4;
-context.strokeRect(0, 0, 90, 90);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-002.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-002.html
deleted file mode 100644
index d72054ee71f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-002.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="geometry-border-image-002-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-.container {
-  width: 50px;
-  height: 50px;
-}
-
-#canvas-geometry {
-  border: solid 0;
-  border-image: paint(geometry);
-  border-image-slice: 0 fill;
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (geom.width == 90 && geom.height == 90)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    document.getElementById('canvas-geometry').style.borderImageOutset = '20px';
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-003-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-003-ref.html
deleted file mode 100644
index b17c9ffce2a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-003-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<canvas id ="canvas" width="80" height="120" style="position:relative; left:-10px; top:-10px"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-context.strokeStyle = 'green';
-context.lineWidth = 4;
-context.strokeRect(0, 0, 80, 120);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-003.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-003.html
deleted file mode 100644
index 9da17e92590..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-003.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="geometry-border-image-003-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-.container {
-  width: 60px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  border: solid 0;
-  border-image: paint(geometry);
-  border-image-slice: 0 fill;
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (geom.width == 80 && geom.height == 120)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    document.getElementById('canvas-geometry').style.borderImageOutset = '10px';
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-004-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-004-ref.html
deleted file mode 100644
index c32fdd8f0ab..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-004-ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<canvas id ="canvas" width="120" height="120"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-// The test geometry-border-image4.html has a 100*100 paint canvas, it specifies
-// border-width=10 and border-image-outset=10, which means that it is drawing to
-// a 140*140 area. However, because the test has "border-image-slice: 0 fill",
-// together with the border-width=10, makes it draw to a 120*120 area.
-// In this ref html, we draw to a 140*140 area, but scale it to fit the 120*120
-// canvas.
-context.scale(120/140, 120/140);
-context.strokeStyle = 'green';
-context.lineWidth = 4;
-context.strokeRect(0, 0, 140, 140);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-004.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-004.html
deleted file mode 100644
index 3aa8b59eb9a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-004.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="geometry-border-image-004-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  border: solid 0;
-  border-image: paint(geometry);
-  border-image-slice: 0 fill;
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (geom.width == 140 && geom.height == 140)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    document.getElementById('canvas-geometry').style.borderWidth = '10px';
-    document.getElementById('canvas-geometry').style.borderImageOutset = '10px';
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-005-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-005-ref.html
deleted file mode 100644
index a5781456d1f..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-005-ref.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<canvas id ="canvas" width="240" height="240" style="position:relative; left:-20px; top:-20px"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-context.strokeStyle = 'green';
-context.lineWidth = 8;
-context.strokeRect(0, 0, 240, 240);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-005.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-005.html
deleted file mode 100644
index 18093e8661c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/geometry-border-image-005.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="geometry-border-image-005-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  border: solid 0;
-  border-image: paint(geometry);
-  border-image-slice: 0 fill;
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (geom.width == 120 && geom.height == 120)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    document.getElementById('canvas-geometry').style.borderImageOutset = '10px';
-    document.body.style.zoom = "200%";
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-constructor-error-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-constructor-error-ref.html
deleted file mode 100644
index b6a6dec6c60..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-constructor-error-ref.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="background: green; width: 100px; height: 100px"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-constructor-error.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-constructor-error.html
deleted file mode 100644
index 4800df463b7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-constructor-error.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="invalid-image-constructor-error-ref.html">
-<style>
-    #output {
-        width: 100px;
-        height: 100px;
-        background-image: paint(error);
-        background-color: green;
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('error', class {
-    constructor() { throw Error('failed!'); }
-    paint(ctx, geom) {
-        ctx.fillStyle = 'red';
-        ctx.fillRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-paint-error-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-paint-error-ref.html
deleted file mode 100644
index b6a6dec6c60..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-paint-error-ref.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="background: green; width: 100px; height: 100px"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-paint-error.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-paint-error.html
deleted file mode 100644
index 7e19c296a68..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-paint-error.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="invalid-image-paint-error-ref.html">
-<style>
-    #output {
-        width: 100px;
-        height: 100px;
-        background-image: paint(error);
-        background-color: green;
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('error', class {
-    paint(ctx, geom) {
-        ctx.fillStyle = 'red';
-        ctx.fillRect(0, 0, geom.width, geom.height);
-        throw Error('failed!');
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-pending-script-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-pending-script-ref.html
deleted file mode 100644
index b6a6dec6c60..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-pending-script-ref.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="background: green; width: 100px; height: 100px"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-pending-script.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-pending-script.html
deleted file mode 100644
index 42df38a82a3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/invalid-image-pending-script.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="invalid-image-pending-script-ref.html">
-<style>
-    #output {
-        width: 100px;
-        height: 100px;
-        background-image: paint(invalid);
-        background-color: green;
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint("");
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/overdraw-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/overdraw-ref.html
deleted file mode 100644
index b6a6dec6c60..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/overdraw-ref.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="background: green; width: 100px; height: 100px"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/overdraw.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/overdraw.html
deleted file mode 100644
index 6258b83fb5b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/overdraw.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html class=reftest-wait>
-<link rel="match" href="overdraw-ref.html">
-<style>
-    #output {
-        width: 100px;
-        height: 100px;
-        background-image: paint(green);
-        background-color: red;
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('green', class {
-    paint(ctx, geom) {
-        ctx.fillStyle = 'green';
-        ctx.fillRect(-10, -10, geom.width + 20, geom.height + 20);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-arguments-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-arguments-ref.html
deleted file mode 100644
index 3352acf6518..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-arguments-ref.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-#background {
-  background-color: yellow;
-  display: inline-block;
-}
-
-.container {
-  font-size: 0px;
-}
-</style>
-</head>
-<body>
-
-<div id="background">
-  <div class="container">
-    <canvas id ="box-green" width="100" height="100"></canvas>
-  </div>
-  <div class="container">
-    <canvas id ="box-red" width="100" height="100"></canvas>
-  </div>
-</div>
-
-<script>
-function drawCanvas(canvasID, color) {
-  var canvas = document.getElementById(canvasID);
-  var context = canvas.getContext("2d", {alpha: true});
-  context.clearRect(0, 0, canvas.width, canvas.height);
-  context.strokeStyle = color;
-  context.lineWidth = 4;
-  context.strokeRect(20, 20, 60, 60);
-};
-
-drawCanvas('box-green', 'green');
-drawCanvas('box-red', 'red');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-arguments.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-arguments.html
deleted file mode 100644
index f80d7cefcc0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-arguments.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="paint-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-box-green {
-  background-image: paint(box, green);
-}
-
-#canvas-box-red {
-  background-image: paint(box, red);
-}
-
-#background {
-  background-color: yellow;
-  display: inline-block;
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-
-<div id="background">
-  <div id="canvas-box-green" class="container"></div>
-  <div id="canvas-box-red" class="container"></div>
-</div>
-
-<script id="code" type="text/worklet">
-registerPaint('box', class {
-    static get alpha() { return true; }
-    static get inputArguments() { return ['<color>']; }
-    paint(ctx, geom, properties, args) {
-    console.log(args.constructor);
-        ctx.strokeStyle = args[0].toString();
-        ctx.lineWidth = 4;
-        ctx.strokeRect(20, 20, 60, 60);
-    }
-});
-
-</script>
-
-<script>
-  importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-function-arguments-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-function-arguments-ref.html
deleted file mode 100644
index 99adfd27121..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-function-arguments-ref.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-#background {
-  background-color: yellow;
-  display: inline-block;
-}
-
-.container {
-  font-size: 0px;
-}
-</style>
-</head>
-<body>
-
-<div id="background">
-  <div class="container">
-    <canvas id ="box-1" width="200" height="200"></canvas>
-  </div>
-  <div class="container">
-    <canvas id ="box-2" width="200" height="200"></canvas>
-  </div>
-</div>
-
-<script>
-function drawCanvas(canvasID, color, width) {
-  var canvas = document.getElementById(canvasID);
-  var context = canvas.getContext("2d", {alpha: true});
-  context.clearRect(0, 0, canvas.width, canvas.height);
-  context.strokeStyle = color;
-  context.lineWidth = width;
-  context.strokeRect(40, 40, 120, 120);
-};
-
-drawCanvas('box-1', 'rgb(50, 100, 150)', '5px');
-drawCanvas('box-2', 'rgb(150, 100, 50)', '10px');
-
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-function-arguments.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-function-arguments.html
deleted file mode 100644
index 1cec58bc190..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint-function-arguments.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="paint-function-arguments-ref.html">
-<style>
-.container {
-  width: 200px;
-  height: 200px;
-}
-
-#canvas-box-1 {
-  background-image: paint(box, rgb(50, 100, 150), 5px);
-}
-
-#canvas-box-2 {
-  background-image: paint(box, rgb(150, 100, 50), 10px);
-}
-
-#background {
-  background-color: yellow;
-  display: inline-block;
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-
-<div id="background">
-  <div id="canvas-box-1" class="container"></div>
-  <div id="canvas-box-2" class="container"></div>
-</div>
-
-<script id="code" type="text/worklet">
-registerPaint('box', class {
-    static get alpha() { return true; }
-    static get inputArguments() { return ['<color>', '<length>']; }
-    paint(ctx, geom, properties, args) {
-        ctx.strokeStyle = args[0].toString();
-        ctx.lineWidth = args[1].toString();
-        ctx.strokeRect(40, 40, 120, 120);
-    }
-});
-
-</script>
-
-<script>
-  importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-composite-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-composite-ref.html
deleted file mode 100644
index 3b75d526980..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-composite-ref.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-    canvas { display: inline-block; }
-</style>
-</head>
-<body>
-<canvas id="source-over" width="80" height="80"></canvas>
-<canvas id="source-in" width="80" height="80"></canvas>
-<canvas id="source-out" width="80" height="80"></canvas>
-<canvas id="source-atop" width="80" height="80"></canvas>
-<br>
-<canvas id="destination-over" width="80" height="80"></canvas>
-<canvas id="destination-in" width="80" height="80"></canvas>
-<canvas id="destination-out" width="80" height="80"></canvas>
-<canvas id="destination-atop" width="80" height="80"></canvas>
-<br>
-<canvas id="lighter" width="80" height="80"></canvas>
-<canvas id="xor" width="80" height="80"></canvas>
-<script>
-var compositeOps = [
-    'source-over',
-    'source-in',
-    'source-out',
-    'source-atop',
-    'destination-over',
-    'destination-in',
-    'destination-out',
-    'destination-atop',
-    'lighter',
-    'xor'
-];
-
-for (var i = 0; i < compositeOps.length; i++) {
-    var op = compositeOps[i];
-    var ctx = document.getElementById(op).getContext('2d');
-    ctx.fillStyle = 'red';
-    ctx.fillRect(5, 5, 40, 40);
-
-    ctx.globalCompositeOperation = op;
-
-    ctx.fillStyle = 'deepskyblue';
-    ctx.beginPath();
-    ctx.arc(45,45,20,0,Math.PI*2,true);
-    ctx.fill();
-}
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-composite.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-composite.html
deleted file mode 100644
index 362b84947fd..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-composite.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="paint2d-composite-ref.html">
-<style>
-    div {
-        display: inline-block;
-        width: 80px;
-        height: 80px;
-    }
-    #source-over { background-image: paint(source-over); }
-    #source-in { background-image: paint(source-in); }
-    #source-out { background-image: paint(source-out); }
-    #source-atop { background-image: paint(source-atop); }
-    #destination-over { background-image: paint(destination-over); }
-    #destination-in { background-image: paint(destination-in); }
-    #destination-out { background-image: paint(destination-out); }
-    #destination-atop { background-image: paint(destination-atop); }
-    #lighter { background-image: paint(lighter); }
-    #xor { background-image: paint(xor); }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="source-over"></div>
-<div id="source-in"></div>
-<div id="source-out"></div>
-<div id="source-atop"></div>
-<br>
-<div id="destination-over"></div>
-<div id="destination-in"></div>
-<div id="destination-out"></div>
-<div id="destination-atop"></div>
-<br>
-<div id="lighter"></div>
-<div id="xor"></div>
-
-<script id="code" type="text/worklet">
-var compositeOps = [
-    'source-over',
-    'source-in',
-    'source-out',
-    'source-atop',
-    'destination-over',
-    'destination-in',
-    'destination-out',
-    'destination-atop',
-    'lighter',
-    'xor'
-];
-
-function doPaint(ctx, op) {
-    ctx.fillStyle = 'red';
-    ctx.fillRect(5, 5, 40, 40);
-
-    ctx.globalCompositeOperation = op;
-
-    ctx.fillStyle = 'deepskyblue';
-    ctx.beginPath();
-    ctx.arc(45,45,20,0,Math.PI*2,true);
-    ctx.fill();
-}
-
-for (var i = 0; i < compositeOps.length; i++) {
-    let op = compositeOps[i];
-    registerPaint(op, class { paint(ctx, geom) { doPaint(ctx, op); } });
-}
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-filter-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-filter-ref.html
deleted file mode 100644
index 4ca6383b141..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-filter-ref.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-    canvas { display: inline-block; }
-</style>
-</head>
-<body>
-<canvas id='output0' width='100' height='100'></canvas>
-<canvas id='output1' width='100' height='100'></canvas>
-<canvas id='output2' width='100' height='100'></canvas>
-<canvas id='output3' width='100' height='100'></canvas>
-<canvas id='output4' width='100' height='100'></canvas>
-<br>
-<canvas id='output5' width='100' height='100'></canvas>
-<canvas id='output6' width='100' height='100'></canvas>
-<canvas id='output7' width='100' height='100'></canvas>
-<canvas id='output8' width='100' height='100'></canvas>
-<canvas id='output9' width='100' height='100'></canvas>
-<br>
-<canvas id='output10' width='100' height='100'></canvas>
-<canvas id='output11' width='100' height='100'></canvas>
-<canvas id='output12' width='100' height='100'></canvas>
-<canvas id='output13' width='100' height='100'></canvas>
-<canvas id='output14' width='100' height='100'></canvas>
-
-<script>
-var paint = function(id, filter) {
-  var c = document.getElementById(id);
-  var ctx = c.getContext('2d');
-  ctx.filter = filter;
-  ctx.fillStyle = '#A00';
-  ctx.fillRect(0, 0, 15, 15);
-  ctx.fillStyle = '#0A0';
-  ctx.fillRect(15, 0, 15, 15);
-  ctx.fillStyle = '#00A';
-  ctx.fillRect(0, 15, 15, 15);
-  ctx.fillStyle = "#AA0";
-  ctx.fillRect(15, 15, 15, 15);
-  return ctx;
-};
-
-paint('output0', "none");
-paint('output1', "blur(10px)");
-paint('output2', "blur(0px)");
-paint('output3', "blur(16px)");
-paint('output4', "blur(0px)");
-paint('output5', "brightness(40%)");
-paint('output6', "contrast(20%)");
-paint('output7', "drop-shadow(0 0 5px green)");
-paint('output8', "grayscale(100%)");
-paint('output9', "invert(100%)");
-paint('output10', "opacity(50%)");
-paint('output11', "saturate(20%)");
-paint('output12', "sepia(100%)");
-paint('output13', "sepia(1) hue-rotate(200deg)");
-paint('output14', "url(#url)");
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-filter.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-filter.html
deleted file mode 100644
index 9347af51f78..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-filter.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="paint2d-filter-ref.html">
-<style>
-    div {
-        display: inline-block;
-        width: 100px;
-        height: 100px;
-    }
-    #filter-none { background-image: paint(filter-none); }
-    #filter-blur-10px { background-image: paint(filter-blur-10px); }
-    #filter-blur-50vh { background-image: paint(filter-blur-50vh); }
-    #filter-blur-1em { background-image: paint(filter-blur-1em); }
-    #filter-blur-2percent { background-image: paint(filter-blur-2percent); }
-    #filter-brightness { background-image: paint(filter-brightness); }
-    #filter-contrast { background-image: paint(filter-contrast); }
-    #filter-drop-shadow { background-image: paint(filter-drop-shadow); }
-    #filter-grayscale { background-image: paint(filter-grayscale); }
-    #filter-invert { background-image: paint(filter-invert); }
-    #filter-opacity { background-image: paint(filter-opacity); }
-    #filter-saturate { background-image: paint(filter-saturate); }
-    #filter-sepia { background-image: paint(filter-sepia); }
-    #filter-hue-rotate { background-image: paint(filter-hue-rotate); }
-    #filter-url { background-image: paint(filter-url); }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="filter-none"></div>
-<div id="filter-blur-10px"></div>
-<div id="filter-blur-50vh"></div>
-<div id="filter-blur-1em"></div>
-<div id="filter-blur-2percent"></div>
-<br>
-<div id="filter-brightness"></div>
-<div id="filter-contrast"></div>
-<div id="filter-drop-shadow"></div>
-<div id="filter-grayscale"></div>
-<div id="filter-invert"></div>
-<br>
-<div id="filter-opacity"></div>
-<div id="filter-saturate"></div>
-<div id="filter-sepia"></div>
-<div id="filter-hue-rotate"></div>
-<div id="filter-url"></div>
-
-<script id="code" type="text/worklet">
-var paintNames = [
-    'filter-none',
-    'filter-blur-10px',
-    'filter-blur-50vh',
-    'filter-blur-1em',
-    'filter-blur-2percent',
-    'filter-brightness',
-    'filter-contrast',
-    'filter-drop-shadow',
-    'filter-grayscale',
-    'filter-invert',
-    'filter-opacity',
-    'filter-saturate',
-    'filter-sepia',
-    'filter-hue-rotate',
-    'filter-url'
-];
-
-var filterOps = [
-    'none',
-    'blur(10px)',
-    'blur(50vh)',
-    'blur(1em)',
-    'blur(2%)',
-    'brightness(40%)',
-    'contrast(20%)',
-    'drop-shadow(0 0 5px green)',
-    'grayscale(100%)',
-    'invert(100%)',
-    'opacity(50%)',
-    'saturate(20%)',
-    'sepia(100%)',
-    'sepia(1) hue-rotate(200deg)',
-    'url(#url)'
-];
-
-function doPaint(ctx, op) {
-  ctx.filter = op;
-  ctx.fillStyle = '#A00';
-  ctx.fillRect(0, 0, 15, 15);
-  ctx.fillStyle = '#0A0';
-  ctx.fillRect(15, 0, 15, 15);
-  ctx.fillStyle = '#00A';
-  ctx.fillRect(0, 15, 15, 15);
-  ctx.fillStyle = "#AA0";
-  ctx.fillRect(15, 15, 15, 15);
-};
-
-for (var i = 0; i < filterOps.length; i++) {
-  let op = filterOps[i];
-  registerPaint(paintNames[i], class { paint(ctx, geom) { doPaint(ctx, op); } });
-}
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-gradient-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-gradient-ref.html
deleted file mode 100644
index a8064f595ef..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-gradient-ref.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<canvas id ="output" width="200" height="100"></canvas>
-<script>
-var canvas = document.getElementById('output');
-var ctx = canvas.getContext('2d');
-
-var linearGradient = ctx.createLinearGradient(0, 0, 100, 100);
-linearGradient.addColorStop(0, 'blue');
-linearGradient.addColorStop(0.5, 'red');
-linearGradient.addColorStop(1, 'white');
-ctx.fillStyle = linearGradient;
-ctx.fillRect(0, 0, 100, 100);
-
-var radialGradient = ctx.createRadialGradient(150, 50, 0, 150, 50, 50);
-radialGradient.addColorStop(0, 'blue');
-radialGradient.addColorStop(0.5, 'red');
-radialGradient.addColorStop(1, 'white');
-ctx.fillStyle = radialGradient;
-ctx.fillRect(100, 0, 100, 100);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-gradient.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-gradient.html
deleted file mode 100644
index 24fc38a1f5a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-gradient.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="paint2d-gradient-ref.html">
-<style>
-    #output {
-        width: 200px;
-        height: 100px;
-        background-image: paint(gradients);
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('gradients', class {
-    paint(ctx, geom) {
-        var linearGradient = ctx.createLinearGradient(0, 0, 100, 100);
-        linearGradient.addColorStop(0, 'blue');
-        linearGradient.addColorStop(0.5, 'red');
-        linearGradient.addColorStop(1, 'white');
-        ctx.fillStyle = linearGradient;
-        ctx.fillRect(0, 0, 100, 100);
-
-        var radialGradient = ctx.createRadialGradient(150, 50, 0, 150, 50, 50);
-        radialGradient.addColorStop(0, 'blue');
-        radialGradient.addColorStop(0.5, 'red');
-        radialGradient.addColorStop(1, 'white');
-        ctx.fillStyle = radialGradient;
-        ctx.fillRect(100, 0, 100, 100);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-image-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-image-ref.html
deleted file mode 100644
index 31c9f3f5f03..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-image-ref.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<canvas id="canvas" width="300" height="300"></canvas>
-
-<script>
-    var canvas = document.getElementById("canvas");
-    var ctx = canvas.getContext("2d");
-    var img = new Image;
-    img.src = "resources/html5.png";
-    img.onload = function() {
-        ctx.drawImage(img, 0, 0);
-    };
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-image.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-image.html
deleted file mode 100644
index b8c38dad131..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-image.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="paint2d-image-ref.html">
-<style>
-    #output {
-        width: 300px;
-        height: 300px;
-        background-image: paint(image);
-        border-image: url("resources/html5.png");
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-    registerPaint('image', class {
-        static get inputProperties() { return [ 'border-image-source' ]; };
-        paint(ctx, geom, styleMap) {
-            ctx.drawImage(styleMap.get('border-image-source'), 0, 0);
-        }
-    });
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-paths-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-paths-ref.html
deleted file mode 100644
index 7557411b4a1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-paths-ref.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<canvas id ="output" width="300" height="400"></canvas>
-<script>
-var canvas = document.getElementById('output');
-var ctx = canvas.getContext('2d');
-
-ctx.beginPath();
-ctx.lineWidth = '10';
-ctx.strokeStyle = 'green';
-ctx.moveTo(15, 15);
-ctx.lineTo(135, 15);
-ctx.lineTo(70, 170);
-ctx.closePath();
-ctx.stroke();
-
-var path1 = new Path2D();
-path1.moveTo(250, 25);
-path1.bezierCurveTo(110, 150, 110, 300, 200, 200);
-ctx.strokeStyle = 'purple';
-ctx.setLineDash([ 10, 5 ]);
-ctx.stroke(path1);
-
-ctx.fillStyle = 'red';
-ctx.beginPath()
-ctx.arc(75, 325, 50, 0, Math.PI * 2, true);
-ctx.arc(75, 325, 20, 0, Math.PI * 2, true);
-ctx.fill('evenodd');
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-paths.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-paths.html
deleted file mode 100644
index d61ef827b22..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-paths.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="paint2d-paths-ref.html">
-<style>
-    #output {
-        width: 300px;
-        height: 400px;
-        background-image: paint(paths);
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('paths', class {
-    paint(ctx, geom) {
-        ctx.beginPath();
-        ctx.lineWidth = '10';
-        ctx.strokeStyle = 'green';
-        ctx.moveTo(15, 15);
-        ctx.lineTo(135, 15);
-        ctx.lineTo(70, 170);
-        ctx.closePath();
-        ctx.stroke();
-
-        var path1 = new Path2D();
-        path1.moveTo(250, 25);
-        path1.bezierCurveTo(110, 150, 110, 300, 200, 200);
-        ctx.strokeStyle = 'purple';
-        ctx.setLineDash([ 10, 5 ]);
-        ctx.stroke(path1);
-
-        ctx.fillStyle = 'red';
-        ctx.beginPath()
-        ctx.arc(75, 325, 50, 0, Math.PI * 2, true);
-        ctx.arc(75, 325, 20, 0, Math.PI * 2, true);
-        ctx.fill('evenodd');
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-rects-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-rects-ref.html
deleted file mode 100644
index fae2de7b7a2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-rects-ref.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<canvas id ="output" width="100" height="100" style="background: blue;"></canvas>
-<script>
-var canvas = document.getElementById('output');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = 'green';
-ctx.fillRect(0, 0, 100, 100);
-
-ctx.clearRect(40, 40, 20, 20);
-
-ctx.strokeStyle = 'red';
-ctx.lineWidth = 4;
-ctx.strokeRect(20, 20, 60, 60);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-rects.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-rects.html
deleted file mode 100644
index 4a4e4708bf0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-rects.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="paint2d-rects-ref.html">
-<style>
-    #output {
-        width: 100px;
-        height: 100px;
-        background-image: paint(rects);
-        background-color: blue;
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('rects', class {
-    paint(ctx, geom) {
-        ctx.fillStyle = 'green';
-        ctx.fillRect(0, 0, geom.width, geom.height);
-
-        ctx.clearRect(40, 40, 20, 20);
-
-        ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(20, 20, 60, 60);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-shadows-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-shadows-ref.html
deleted file mode 100644
index 268db495ee5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-shadows-ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<canvas id ="output" width="200" height="100"></canvas>
-<script>
-var canvas = document.getElementById('output');
-var ctx = canvas.getContext('2d');
-
-ctx.shadowColor = 'black';
-ctx.shadowOffsetY = 10;
-ctx.shadowOffsetX = 10;
-ctx.fillStyle = 'green'
-ctx.fillRect(10, 10, 50, 50);
-
-ctx.shadowColor = 'blue';
-ctx.shadowBlur = 10;
-ctx.shadowOffsetX = 5;
-ctx.shadowOffsetY = 5;
-ctx.fillStyle = 'green';
-ctx.fillRect(110, 10, 50, 50);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-shadows.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-shadows.html
deleted file mode 100644
index c0200df04d3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-shadows.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="paint2d-shadows-ref.html">
-<style>
-    #output {
-        width: 200px;
-        height: 100px;
-        background-image: paint(shadows);
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('shadows', class {
-    paint(ctx, geom) {
-        ctx.shadowColor = 'black';
-        ctx.shadowOffsetY = 10;
-        ctx.shadowOffsetX = 10;
-        ctx.fillStyle = 'green'
-        ctx.fillRect(10, 10, 50, 50);
-
-        ctx.shadowColor = 'blue';
-        ctx.shadowBlur = 10;
-        ctx.shadowOffsetX = 5;
-        ctx.shadowOffsetY = 5;
-        ctx.fillStyle = 'green';
-        ctx.fillRect(110, 10, 50, 50);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-transform-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-transform-ref.html
deleted file mode 100644
index e863f363f79..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-transform-ref.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<canvas id ="output" width="200" height="200"></canvas>
-<script>
-var canvas = document.getElementById('output');
-var ctx = canvas.getContext('2d');
-
-ctx.fillStyle = 'green';
-ctx.transform(1, 0.5, 0, 1, 20, 20);
-ctx.fillRect(0, 0, 50, 50);
-
-ctx.resetTransform();
-
-ctx.fillStyle = 'blue';
-ctx.translate(150, 60);
-ctx.rotate(60 * Math.PI / 180);
-ctx.scale(1.5, 1);
-ctx.fillRect(0, 0, 50, 50);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-transform.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-transform.html
deleted file mode 100644
index 1d1177e30f7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-transform.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="paint2d-transform-ref.html">
-<style>
-    #output {
-        width: 200px;
-        height: 200px;
-        background-image: paint(transform);
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('transform', class {
-    paint(ctx, geom) {
-        ctx.fillStyle = 'green';
-        ctx.transform(1, 0.5, 0, 1, 20, 20);
-        ctx.fillRect(0, 0, 50, 50);
-
-        ctx.resetTransform();
-
-        ctx.fillStyle = 'blue';
-        ctx.translate(150, 60);
-        ctx.rotate(60 * Math.PI / 180);
-        ctx.scale(1.5, 1);
-        ctx.fillRect(0, 0, 50, 50);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-zoom-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-zoom-ref.html
deleted file mode 100644
index c96893e2f37..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-zoom-ref.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-html, body { margin: 0; padding: 0; }
-</style>
-<body>
-<div style="position:relative">
-<canvas id="output" width="300" height="300"></canvas>
-</div>
-<script>
-var canvas = document.getElementById('output');
-var ctx = canvas.getContext('2d');
-ctx.rotate(10 * Math.PI / 180);
-ctx.strokeStyle = 'blue';
-ctx.lineWidth = 12;
-ctx.strokeRect(90, 30, 90, 90);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-zoom.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-zoom.html
deleted file mode 100644
index be59106115c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/paint2d-zoom.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="paint2d-zoom-ref.html">
-<style>
-html, body { margin: 0; padding: 0; }
-#output {
-    width: 100px;
-    height: 100px;
-    background-image: paint(worklet);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('worklet', class {
-    paint(ctx, geom) {
-         ctx.rotate(10 * Math.PI / 180);
-         ctx.strokeStyle = 'blue';
-         ctx.lineWidth = 4;
-         ctx.strokeRect(30, 10, 30, 30);
-    }
-});
-</script>
-
-<script>
-    document.body.style.zoom = "300%";
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-001.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-001.html
deleted file mode 100644
index b01ba917827..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-001.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo', class {
-        static get inputArguments() {
-            throw Error('failed!');
-        }
-    });
-} catch(ex) {
-    if (ex.name == 'Error' && ex.message == 'failed!')
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-002.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-002.html
deleted file mode 100644
index 34e583a93f2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-002.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo1', class {
-        static get inputArguments() {
-            return 'non sense stuff';
-        }
-    });
-} catch(ex) {
-    if (ex.name == "TypeError" && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The provided value cannot be converted to a sequence.")
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-003.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-003.html
deleted file mode 100644
index f1275884839..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-003.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo2', class {
-        static get inputArguments() {
-            return ['<non-sense-type>'];
-        }
-    });
-} catch(ex) {
-    if (ex.name == "TypeError" && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': Invalid argument types.")
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-004.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-004.html
deleted file mode 100644
index a4415f54c05..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-004.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo3', class {
-        static get inputArguments() {
-            return ['<length>'];
-        }
-        paint() { }
-    });
-    testsPassed = true;
-} catch(ex) {
-    testsPassed = false;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-005.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-005.html
deleted file mode 100644
index 2659b24aa8c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-005.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo', class { paint() { } });
-    registerPaint('foo', class { paint() { } });
-} catch(ex) {
-    if (ex.name == "NotSupportedError" && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': A class with name:'foo' is already registered.")
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-006.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-006.html
deleted file mode 100644
index 16061e2d7c3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-006.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('', class { });
-} catch(ex) {
-    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The empty string is not a valid name.")
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-007.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-007.html
deleted file mode 100644
index b9096a1453a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-007.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo3', class {
-        static get inputProperties() {
-            throw Error('failed!');
-        }
-    });
-} catch(ex) {
-    if (ex.name == 'Error' && ex.message == 'failed!')
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-008.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-008.html
deleted file mode 100644
index dcaa016be1b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-008.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo4', class {
-        static get inputProperties() {
-            return 42;
-        }
-    });
-} catch(ex) {
-    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The provided value cannot be converted to a sequence.")
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-009.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-009.html
deleted file mode 100644
index 026f3b118c0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-009.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    var a = function() { };
-    a.prototype = undefined;
-    registerPaint('foo5', a);
-} catch(ex) {
-    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The 'prototype' object on the class does not exist.")
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-010.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-010.html
deleted file mode 100644
index 4a4c126a07b..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-010.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    var b = function() { };
-    b.prototype = 42;
-    registerPaint('foo6', b);
-} catch(ex) {
-    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The 'prototype' property on the class is not an object.")
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-011.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-011.html
deleted file mode 100644
index 3dd46cfa80e..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-011.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo7', class { });
-} catch(ex) {
-    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The 'paint' function on the prototype does not exist.")
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-012.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-012.html
deleted file mode 100644
index e70c2204224..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-012.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo8', class {
-        get paint() {
-            return 42;
-        }
-    });
-} catch(ex) {
-    if (ex.name == 'TypeError' && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The 'paint' property on the prototype is not a function.")
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-013.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-013.html
deleted file mode 100644
index 7d333725c27..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-013.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo9', class { paint() { } });
-    testsPassed = true;
-} catch(ex) {
-    testsPassed = false;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-014.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-014.html
deleted file mode 100644
index 2470411a32c..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-014.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    var c = function() { };
-    c.prototype.paint = function() { };
-    registerPaint('foo10', c);
-    testsPassed = true;
-} catch(ex) {
-    testsPassed = false;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-015.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-015.html
deleted file mode 100644
index cb043517ac7..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-015.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo11', class {
-        static get inputProperties() {
-            return ['-webkit-border-radius'];
-    }
-        paint() { }
-    });
-    testsPassed = true;
-} catch(ex) {
-    testsPassed = false;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-016.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-016.html
deleted file mode 100644
index d9cb14bc145..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-016.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo12', class {
-        static get alpha() {
-            return 42;
-        }
-    });
-} catch(ex) {
-    if (ex.name == "TypeError" && ex.message == "Failed to execute 'registerPaint' on 'PaintWorkletGlobalScope': The 'alpha' property on the class is not a boolean.")
-        testsPassed = true;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-017.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-017.html
deleted file mode 100644
index f7cf3737d1d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-017.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-var testsPassed = false;
-try {
-    registerPaint('foo13', class {
-        static get alpha() {
-            return true;
-        }
-        paint() { }
-    });
-    testsPassed = true;
-} catch(ex) {
-    testsPassed = false;
-}
-
-registerPaint('geometry', class {
-    paint(ctx, geom) {
-        if (testsPassed)
-            ctx.strokeStyle = 'green';
-        else
-            ctx.strokeStyle = 'red';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-ref.html
deleted file mode 100644
index 086bc7b27ee..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/parse-input-arguments-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<canvas id ="canvas" width="100" height="100"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-context.strokeStyle = 'green';
-context.lineWidth = 4;
-context.strokeRect(0, 0, 100, 100);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/registered-properties-in-custom-paint.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/registered-properties-in-custom-paint.html
deleted file mode 100644
index d725a8f18a3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/registered-properties-in-custom-paint.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="parse-input-arguments-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-  --length: 10px;
-  --number: 10;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    static get inputProperties() {
-        return [
-            '--length',
-            '--length-initial',
-            '--number',
-        ];
-    }
-    paint(ctx, geom, styleMap) {
-        const properties = styleMap.getProperties().sort();
-        var serializedStrings = [];
-        for (let i = 0; i < properties.length; i++) {
-            const value = styleMap.get(properties[i]);
-            let serialized;
-            if (value)
-                serialized = properties[i].toString() + ': [' + value.constructor.name + '=' + value.toString() + ']';
-            else
-                serialized = properties[i].toString() + ': [null]';
-            serializedStrings.push(serialized);
-        }
-        ctx.strokeStyle = 'green';
-        if (serializedStrings[0] != "--length: [CSSUnitValue=10px]")
-            ctx.strokeStyle = 'red';
-        if (serializedStrings[1] != "--length-initial: [CSSUnitValue=20px]")
-            ctx.strokeStyle = 'blue';
-        if (serializedStrings[2] != "--number: [CSSStyleValue=10]")
-            ctx.strokeStyle = 'yellow';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    CSS.registerProperty({name: '--length', syntax: '<length>', initialValue: '0px'});
-    CSS.registerProperty({name: '--length-initial', syntax: '<length>', initialValue: '20px'});
-    CSS.registerProperty({name: '--number', syntax: '<number>', initialValue: '0'});
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/resources/html5.png b/tests/wpt/mozilla/tests/mozilla/css-paint-api/resources/html5.png
deleted file mode 100644
index bfc98fdc062..00000000000
Binary files a/tests/wpt/mozilla/tests/mozilla/css-paint-api/resources/html5.png and /dev/null differ
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-background-image-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-background-image-ref.html
deleted file mode 100644
index 3fc9e6efcc9..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-background-image-ref.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<canvas id ="canvas" width="100" height="100" style="border-radius: 2px"></canvas>
-<script>
-var canvas = document.getElementById('canvas');
-var context = canvas.getContext("2d");
-context.strokeStyle = 'green';
-context.lineWidth = 4;
-context.strokeRect(0, 0, 100, 100);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-background-image.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-background-image.html
deleted file mode 100644
index 3dfdd10431a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-background-image.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="style-background-image-ref.html">
-<style>
-.container {
-  width: 100px;
-  height: 100px;
-  border-radius: 2px;
-  --foo: bar;
-}
-
-#canvas-geometry {
-  background-image: paint(geometry);
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body>
-<div id="canvas-geometry" class="container"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    static get inputProperties() {
-        return [
-            '--bar',
-            '--foo',
-            'align-items',
-            'border-radius',
-        ];
-    }
-    paint(ctx, geom, styleMap) {
-        const properties = styleMap.getProperties().sort();
-        var serializedStrings = [];
-        for (let i = 0; i < properties.length; i++) {
-            const value = styleMap.get(properties[i]);
-            let serialized;
-            if (value)
-                serialized = properties[i].toString() + ': [' + value.constructor.name + '=' + value.toString() + ']';
-            else
-                serialized = properties[i].toString() + ': [null]';
-            serializedStrings.push(serialized);
-        }
-        ctx.strokeStyle = 'green';
-        if (serializedStrings[0] != "--bar: [null]")
-            ctx.strokeStyle = 'red';
-        if (serializedStrings[1] != "--foo: [CSSStyleValue= bar]")
-            ctx.strokeStyle = 'blue';
-        if (serializedStrings[2] != "align-items: [CSSKeywordValue=normal]")
-            ctx.strokeStyle = 'yellow';
-        if (serializedStrings[3] != "border-radius: [CSSStyleValue=2px]")
-            ctx.strokeStyle = 'cyan';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-before-pseudo-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-before-pseudo-ref.html
deleted file mode 100644
index 9a666efe9c3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-before-pseudo-ref.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-div {
-    border-radius: 3px;
-}
-div::before {
-    width: 100px;
-    height: 100px;
-    border-radius: 2px;
-    content: 'foo';
-    color: rgba(0, 0, 0, 0);
-}
-canvas{
-    border-radius: 2px;
-    display: block;
-    position: relative;
-    top: -1em;
-}
-</style>
-<body style="font: 10px/1 Ahem;">
-    <div><canvas width="30px" height="10px"></canvas></div>
-<script>
-document.addEventListener('DOMContentLoaded', function() {
-    var canvas = document.querySelector('canvas');
-    var context = canvas.getContext("2d");
-    context.strokeStyle = 'green';
-    context.lineWidth = 4;
-    context.strokeRect(0, 0, 30, 10);
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-before-pseudo.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-before-pseudo.html
deleted file mode 100644
index a49d730eb0a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-before-pseudo.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="style-before-pseudo-ref.html">
-<style>
-div {
-    border-radius: 3px;
-}
-
-div::before {
-    width: 100px;
-    height: 100px;
-    content: 'foo';
-    color: rgba(0, 0, 0, 0);
-
-    background-image: paint(geometry);
-    border-radius: 2px;
-    --foo: bar;
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body style="font: 10px/1 Ahem;">
-<div></div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    static get inputProperties() {
-        return [
-            '--bar',
-            '--foo',
-            'border-radius',
-        ];
-    }
-    paint(ctx, geom, styleMap) {
-        const properties = styleMap.getProperties().sort();
-        var serializedStrings = [];
-        for (let i = 0; i < properties.length; i++) {
-            const value = styleMap.get(properties[i]);
-            let serialized;
-            if (value)
-                serialized = properties[i].toString() + ': [' + value.constructor.name + '=' + value.toString() + ']';
-            else
-                serialized = properties[i].toString() + ': [null]';
-            serializedStrings.push(serialized);
-        }
-        ctx.strokeStyle = 'green';
-        if (serializedStrings[0] != "--bar: [null]")
-            ctx.strokeStyle = 'red';
-        if (serializedStrings[1] != "--foo: [CSSStyleValue= bar]")
-            ctx.strokeStyle = 'blue';
-        if (serializedStrings[2] != "border-radius: [CSSStyleValue=2px]")
-            ctx.strokeStyle = 'yellow';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-first-letter-pseudo-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-first-letter-pseudo-ref.html
deleted file mode 100644
index ea5c04a1808..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-first-letter-pseudo-ref.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-<style>
-div {
-    color: rgb(0, 255, 0);
-    line-height: 2px;
-}
-
-div::first-letter {
-    color: rgb(255, 0, 0);
-}
-canvas{
-    position: absolute;
-    top: 4px;
-    z-index: -1;
-}
-</style>
-<body style="font: 10px/1 Ahem;">
-<div><canvas width="10px" height="10px"></canvas>ppp</div>
-<script>
-document.addEventListener('DOMContentLoaded', function() {
-    var canvas = document.querySelector('canvas');
-    var context = canvas.getContext("2d");
-    context.strokeStyle = 'green';
-    context.lineWidth = 4;
-    context.strokeRect(0, 0, 10, 10);
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-first-letter-pseudo.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-first-letter-pseudo.html
deleted file mode 100644
index 744c3ff0c91..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/style-first-letter-pseudo.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="style-first-letter-pseudo-ref.html">
-<style>
-div {
-    color: rgb(0, 255, 0);
-    line-height: 1px;
-    height: 10px;
-}
-
-div::first-letter {
-    background-image: paint(geometry);
-    color: rgb(255, 0, 0);
-    line-height: 2px;
-}
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="css-paint-tests.js"></script>
-<body style="font: 10px/1 Ahem;">
-<div>ppp</div>
-
-<script id="code" type="text/worklet">
-registerPaint('geometry', class {
-    static get inputProperties() {
-        return [
-            'color',
-            'line-height',
-        ];
-    }
-    paint(ctx, geom, styleMap) {
-        const properties = styleMap.getProperties().sort();
-        var serializedStrings = [];
-        for (let i = 0; i < properties.length; i++) {
-            const value = styleMap.get(properties[i]);
-            let serialized;
-            if (value)
-                serialized = properties[i].toString() + ': [' + value.constructor.name + '=' + value.toString() + ']';
-            else
-                serialized = properties[i].toString() + ': [null]';
-            serializedStrings.push(serialized);
-        }
-        ctx.strokeStyle = 'green';
-        if (serializedStrings[0] != "color: [CSSStyleValue=rgb(255, 0, 0)]")
-            ctx.strokeStyle = 'red';
-        if (serializedStrings[1] != "line-height: [CSSUnitValue=2px]")
-            ctx.strokeStyle = 'blue';
-        ctx.lineWidth = 4;
-        ctx.strokeRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-    importPaintWorkletAndTerminateTestAfterAsyncPaint(document.getElementById('code').textContent);
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-after-load-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-after-load-ref.html
deleted file mode 100644
index b6a6dec6c60..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-after-load-ref.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="background: green; width: 100px; height: 100px"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-after-load.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-after-load.html
deleted file mode 100644
index b1ad0d2d73a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-after-load.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="valid-image-after-load-ref.html">
-<style>
-    #output {
-        width: 100px;
-        height: 100px;
-        background-color: red;
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('green', class {
-    paint(ctx, geom) {
-        ctx.fillStyle = 'green';
-        ctx.fillRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-if (window.testRunner) {
-  testRunner.waitUntilDone();
-}
-
-var blob = new Blob([document.getElementById('code').textContent],
-                    {type: 'text/javascript'});
-var frame_cnt = 0;
-paintWorklet.addModule(URL.createObjectURL(blob)).then(function() {
-    var el = document.getElementById('output');
-    el.style.backgroundImage = 'paint(green)';
-    requestAnimationFrame(function() {
-        takeScreenshot(frame_cnt);
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-before-load-ref.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-before-load-ref.html
deleted file mode 100644
index b6a6dec6c60..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-before-load-ref.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<div style="background: green; width: 100px; height: 100px"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-before-load.html b/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-before-load.html
deleted file mode 100644
index b4e6b0e1720..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/css-paint-api/valid-image-before-load.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html class="reftest-wait">
-<link rel="match" href="valid-image-before-load-ref.html">
-<style>
-    #output {
-        width: 100px;
-        height: 100px;
-        background-color: red;
-    }
-</style>
-<script src="/common/reftest-wait.js"></script>
-<script src="/common/css-paint-tests.js"></script>
-<body>
-<div id="output"></div>
-
-<script id="code" type="text/worklet">
-registerPaint('green', class {
-    paint(ctx, geom) {
-        ctx.fillStyle = 'green';
-        ctx.fillRect(0, 0, geom.width, geom.height);
-    }
-});
-</script>
-
-<script>
-if (window.testRunner) {
-  testRunner.waitUntilDone();
-}
-
-var el = document.getElementById('output');
-el.style.backgroundImage = 'paint(green)';
-
-var blob = new Blob([document.getElementById('code').textContent],
-                    {type: 'text/javascript'});
-var frame_cnt = 0;
-paintWorklet.addModule(URL.createObjectURL(blob)).then(function() {
-    requestAnimationFrame(function() {
-        takeScreenshot(frame_cnt);
-    });
-});
-</script>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet.html b/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet.html
index 1dfe906a0e2..595851063ce 100644
--- a/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet.html
+++ b/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet.html
@@ -11,7 +11,7 @@
     <script>
         // This reftest will TIMEOUT if loading the paint worklet fails,
         // It will PASS if the worklet draws a green rectangle.
-        window.paintWorklet
+        CSS.paintWorklet
             .addModule("test_paint_worklet.js")
             .then(function() { document.documentElement.classList.remove("reftest-wait"); });
     </script>
diff --git a/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_loading.html b/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_loading.html
index e1edce96d12..009a2affe99 100644
--- a/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_loading.html
+++ b/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_loading.html
@@ -8,56 +8,56 @@
 var host_info = get_host_info();
 
 promise_test(function() {
-  return paintWorklet.addModule("test_paint_worklet.js");
+  return CSS.paintWorklet.addModule("test_paint_worklet.js");
 }, "Loading a paint worklet.");
 
 promise_test(function(t) {
    var path = new URL("test_paint_worklet.js", document.location).pathname;
    var url = new URL(path, host_info.HTTP_REMOTE_ORIGIN);
-   return promise_rejects(t, "AbortError", paintWorklet.addModule(url));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule(url));
 }, "Loading a cross-origin paint worklet.");
 
 promise_test(function(t) {
-   return promise_rejects(t, "AbortError", paintWorklet.addModule("nonexistent_worklet.js"));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule("nonexistent_worklet.js"));
 }, "Loading a nonexistent paint worklet.");
 
 promise_test(function(t) {
-   return promise_rejects(t, "AbortError", paintWorklet.addModule("syntax_error.js"));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule("syntax_error.js"));
 }, "Loading a syntactically incorrect paint worklet.");
 
 promise_test(function(t) {
-   return promise_rejects(t, "AbortError", paintWorklet.addModule("throw_exception.js"));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule("throw_exception.js"));
 }, "Loading an exception-throwing paint worklet.");
 
 promise_test(function(t) {
-   return promise_rejects(t, "AbortError", paintWorklet.addModule("test_paint_worklet.js"));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule("test_paint_worklet.js"));
 }, "Loading a paint worklet again.");
 
 promise_test(function(t) {
-   return promise_rejects(t, "AbortError", paintWorklet.addModule("test_paint_worklet_empty_name.js"));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule("test_paint_worklet_empty_name.js"));
 }, "Loading a paint worklet with an empty name.");
 
 promise_test(function(t) {
-   return promise_rejects(t, "AbortError", paintWorklet.addModule("test_paint_worklet_properties_throws.js"));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule("test_paint_worklet_properties_throws.js"));
 }, "Loading a paint worklet whose inputProperties throws an exception.");
 
 promise_test(function(t) {
-   return promise_rejects(t, "AbortError", paintWorklet.addModule("test_paint_worklet_arguments_throws.js"));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule("test_paint_worklet_arguments_throws.js"));
 }, "Loading a paint worklet whose inputArguments throws an exception.");
 
 promise_test(function(t) {
-   return promise_rejects(t, "AbortError", paintWorklet.addModule("test_paint_worklet_alpha_throws.js"));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule("test_paint_worklet_alpha_throws.js"));
 }, "Loading a paint worklet whose alpha throws an exception.");
 
 promise_test(function(t) {
-   return promise_rejects(t, "AbortError", paintWorklet.addModule("test_paint_worklet_not_constructor.js"));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule("test_paint_worklet_not_constructor.js"));
 }, "Loading a paint worklet which isn't a constructor function.");
 
 promise_test(function(t) {
-   return promise_rejects(t, "AbortError", paintWorklet.addModule("test_paint_worklet_no_paint.js"));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule("test_paint_worklet_no_paint.js"));
 }, "Loading a paint worklet with no paint.");
 
 promise_test(function(t) {
-   return promise_rejects(t, "AbortError", paintWorklet.addModule("test_paint_worklet_paint_not_callable.js"));
+   return promise_rejects(t, "AbortError", CSS.paintWorklet.addModule("test_paint_worklet_paint_not_callable.js"));
 }, "Loading a paint worklet with a paint that is not callable.");
 </script>
diff --git a/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_size.html b/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_size.html
index 01328b073c3..f3cc376768d 100644
--- a/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_size.html
+++ b/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_size.html
@@ -10,7 +10,7 @@
                     margin: 10px; border: 3px solid blue; padding: 5px;"></div>
     </body>
     <script>
-        window.paintWorklet
+        CSS.paintWorklet
             .addModule("test_paint_worklet_size.js")
             .then(function() { document.documentElement.classList.remove("reftest-wait"); });
     </script>
diff --git a/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_timeout.html b/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_timeout.html
index fd4625b8874..73d7dbe69a4 100644
--- a/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_timeout.html
+++ b/tests/wpt/mozilla/tests/mozilla/worklets/test_paint_worklet_timeout.html
@@ -21,7 +21,7 @@
     </style>
 
     <script>
-      window.paintWorklet.addModule('test_paint_worklet_timeout.js')
+      CSS.paintWorklet.addModule('test_paint_worklet_timeout.js')
             .then(() => document.documentElement.classList.remove('reftest-wait'));
     </script>