diff --git a/.gitignore b/.gitignore
index bf0df10791c..50b1a37ec15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 !/.cargo/config.*
 /.servobuild
 /.wpt
+/.vs
 /android-toolchains
 /target
 /ports/android/bin
diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs
index 81e4bbe4bba..beb29242b5e 100644
--- a/components/canvas/canvas_data.rs
+++ b/components/canvas/canvas_data.rs
@@ -176,7 +176,7 @@ pub struct CanvasData<'a> {
 
 impl<'a> CanvasData<'a> {
     pub fn new(
-        size: Size2D<u32>,
+        size: Size2D<u64>,
         webrender_api_sender: webrender_api::RenderApiSender,
         antialias: AntialiasMode,
         canvas_id: CanvasId,
@@ -708,13 +708,13 @@ impl<'a> CanvasData<'a> {
             .set_composition_op(op.to_azure_style());
     }
 
-    pub fn create(size: Size2D<u32>) -> DrawTarget {
+    pub fn create(size: Size2D<u64>) -> DrawTarget {
         // FIXME(nox): Why is the size made of i32 values?
         DrawTarget::new(BackendType::Skia, size.to_i32(), SurfaceFormat::B8G8R8A8)
     }
 
     pub fn recreate(&mut self, size: Size2D<u32>) {
-        self.drawtarget = CanvasData::create(size);
+        self.drawtarget = CanvasData::create(Size2D::new(size.width as u64, size.height as u64));
         self.state = CanvasPaintState::new(self.state.draw_options.antialias);
         self.saved_states.clear();
         // Webrender doesn't let images change size, so we clear the webrender image key.
diff --git a/components/canvas/canvas_paint_thread.rs b/components/canvas/canvas_paint_thread.rs
index 582512b8e44..b9e0a4fbd45 100644
--- a/components/canvas/canvas_paint_thread.rs
+++ b/components/canvas/canvas_paint_thread.rs
@@ -77,7 +77,7 @@ impl<'a> CanvasPaintThread<'a> {
 
     pub fn create_canvas(
         &mut self,
-        size: Size2D<u32>,
+        size: Size2D<u64>,
         webrender_api_sender: webrender_api::RenderApiSender,
         antialias: bool,
     ) -> CanvasId {
diff --git a/components/canvas_traits/canvas.rs b/components/canvas_traits/canvas.rs
index 49f4690f015..7f3d0ef20ca 100644
--- a/components/canvas_traits/canvas.rs
+++ b/components/canvas_traits/canvas.rs
@@ -23,7 +23,7 @@ pub enum CanvasMsg {
     Canvas2d(Canvas2dMsg, CanvasId),
     Create(
         IpcSender<CanvasId>,
-        Size2D<u32>,
+        Size2D<u64>,
         webrender_api::RenderApiSender,
         bool,
     ),
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
index 3f2430e7ce9..713afb633e9 100644
--- a/components/constellation/constellation.rs
+++ b/components/constellation/constellation.rs
@@ -3108,7 +3108,7 @@ where
 
     fn handle_create_canvas_paint_thread_msg(
         &mut self,
-        size: Size2D<u32>,
+        size: Size2D<u64>,
         response_sender: IpcSender<(IpcSender<CanvasMsg>, CanvasId)>,
     ) {
         let webrender_api = self.webrender_api_sender.clone();
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index f21c7bfda1c..0639e70549a 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -62,8 +62,6 @@ enum CanvasFillOrStrokeStyle {
 #[dom_struct]
 pub struct CanvasRenderingContext2D {
     reflector_: Reflector,
-    #[ignore_malloc_size_of = "Defined in ipc-channel"]
-    ipc_renderer: IpcSender<CanvasMsg>,
     /// For rendering contexts created by an HTML canvas element, this is Some,
     /// for ones created by a paint worklet, this is None.
     canvas: Option<Dom<HTMLCanvasElement>>,
@@ -77,7 +75,7 @@ pub struct CanvasRenderingContext2D {
     state: DomRefCell<CanvasContextState>,
     saved_states: DomRefCell<Vec<CanvasContextState>>,
     origin_clean: Cell<bool>,
-    canvas_id: CanvasId,
+    canvas_state: DomRefCell<CanvasState>,
 }
 
 #[must_root]
@@ -121,14 +119,15 @@ impl CanvasContextState {
     }
 }
 
-impl CanvasRenderingContext2D {
-    pub fn new_inherited(
-        global: &GlobalScope,
-        canvas: Option<&HTMLCanvasElement>,
-        image_cache: Arc<dyn ImageCache>,
-        base_url: ServoUrl,
-        size: Size2D<u32>,
-    ) -> CanvasRenderingContext2D {
+#[derive(JSTraceable, MallocSizeOf)]
+pub struct CanvasState {
+    #[ignore_malloc_size_of = "Defined in ipc-channel"]
+    ipc_renderer: IpcSender<CanvasMsg>,
+    canvas_id: CanvasId,
+}
+
+impl CanvasState {
+    pub fn new(global: &GlobalScope, size: Size2D<u64>) -> CanvasState {
         debug!("Creating new canvas rendering context.");
         let (sender, receiver) =
             profiled_ipc::channel(global.time_profiler_chan().clone()).unwrap();
@@ -139,9 +138,69 @@ impl CanvasRenderingContext2D {
             .unwrap();
         let (ipc_renderer, canvas_id) = receiver.recv().unwrap();
         debug!("Done.");
+        CanvasState {
+            ipc_renderer: ipc_renderer,
+            canvas_id: canvas_id,
+        }
+    }
+
+    pub fn get_canvas_id(&self) -> CanvasId {
+        self.canvas_id.clone()
+    }
+
+    pub fn send_canvas_2d_msg(&self, msg: Canvas2dMsg) {
+        self.ipc_renderer
+            .send(CanvasMsg::Canvas2d(msg, self.get_canvas_id()))
+            .unwrap()
+    }
+
+    fn create_drawable_rect(&self, x: f64, y: f64, w: f64, h: f64) -> Option<Rect<f32>> {
+        if !([x, y, w, h].iter().all(|val| val.is_finite())) {
+            return None;
+        }
+
+        if w == 0.0 && h == 0.0 {
+            return None;
+        }
+
+        Some(Rect::new(
+            Point2D::new(x as f32, y as f32),
+            Size2D::new(w as f32, h as f32),
+        ))
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-context-2d-fillrect
+    pub fn FillRect(&self, x: f64, y: f64, width: f64, height: f64) {
+        if let Some(rect) = self.create_drawable_rect(x, y, width, height) {
+            self.send_canvas_2d_msg(Canvas2dMsg::FillRect(rect));
+        }
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-context-2d-clearrect
+    pub fn ClearRect(&self, x: f64, y: f64, width: f64, height: f64) {
+        if let Some(rect) = self.create_drawable_rect(x, y, width, height) {
+            self.send_canvas_2d_msg(Canvas2dMsg::ClearRect(rect));
+        }
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokerect
+    pub fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) {
+        if let Some(rect) = self.create_drawable_rect(x, y, width, height) {
+            self.send_canvas_2d_msg(Canvas2dMsg::StrokeRect(rect));
+        }
+    }
+}
+
+impl CanvasRenderingContext2D {
+    pub fn new_inherited(
+        global: &GlobalScope,
+        canvas: Option<&HTMLCanvasElement>,
+        image_cache: Arc<dyn ImageCache>,
+        base_url: ServoUrl,
+        size: Size2D<u32>,
+    ) -> CanvasRenderingContext2D {
         CanvasRenderingContext2D {
             reflector_: Reflector::new(),
-            ipc_renderer: ipc_renderer,
             canvas: canvas.map(Dom::from_ref),
             image_cache: image_cache,
             missing_image_urls: DomRefCell::new(Vec::new()),
@@ -149,7 +208,10 @@ impl CanvasRenderingContext2D {
             state: DomRefCell::new(CanvasContextState::new()),
             saved_states: DomRefCell::new(Vec::new()),
             origin_clean: Cell::new(true),
-            canvas_id: canvas_id,
+            canvas_state: DomRefCell::new(CanvasState::new(
+                global,
+                Size2D::new(size.width as u64, size.height as u64),
+            )),
         }
     }
 
@@ -174,8 +236,13 @@ impl CanvasRenderingContext2D {
     // https://html.spec.whatwg.org/multipage/#concept-canvas-set-bitmap-dimensions
     pub fn set_bitmap_dimensions(&self, size: Size2D<u32>) {
         self.reset_to_initial_state();
-        self.ipc_renderer
-            .send(CanvasMsg::Recreate(size, self.get_canvas_id()))
+        self.canvas_state
+            .borrow()
+            .ipc_renderer
+            .send(CanvasMsg::Recreate(
+                size,
+                self.canvas_state.borrow().get_canvas_id(),
+            ))
             .unwrap();
     }
 
@@ -366,7 +433,7 @@ impl CanvasRenderingContext2D {
             match *context {
                 CanvasContext::Context2d(ref context) => {
                     context.send_canvas_2d_msg(Canvas2dMsg::DrawImageInOther(
-                        self.get_canvas_id(),
+                        self.canvas_state.borrow().get_canvas_id(),
                         image_size,
                         dest_rect,
                         source_rect,
@@ -475,21 +542,6 @@ impl CanvasRenderingContext2D {
         mem::replace(&mut self.missing_image_urls.borrow_mut(), vec![])
     }
 
-    fn create_drawable_rect(&self, x: f64, y: f64, w: f64, h: f64) -> Option<Rect<f32>> {
-        if !([x, y, w, h].iter().all(|val| val.is_finite())) {
-            return None;
-        }
-
-        if w == 0.0 && h == 0.0 {
-            return None;
-        }
-
-        Some(Rect::new(
-            Point2D::new(x as f32, y as f32),
-            Size2D::new(w as f32, h as f32),
-        ))
-    }
-
     fn parse_color(&self, string: &str) -> Result<RGBA, ()> {
         let mut input = ParserInput::new(string);
         let mut parser = Parser::new(&mut input);
@@ -528,17 +580,15 @@ impl CanvasRenderingContext2D {
     }
 
     pub fn get_canvas_id(&self) -> CanvasId {
-        self.canvas_id.clone()
+        self.canvas_state.borrow().get_canvas_id()
     }
 
     pub fn send_canvas_2d_msg(&self, msg: Canvas2dMsg) {
-        self.ipc_renderer
-            .send(CanvasMsg::Canvas2d(msg, self.get_canvas_id()))
-            .unwrap()
+        self.canvas_state.borrow().send_canvas_2d_msg(msg)
     }
 
     pub fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg> {
-        self.ipc_renderer.clone()
+        self.canvas_state.borrow().ipc_renderer.clone()
     }
 
     pub fn origin_is_clean(&self) -> bool {
@@ -585,12 +635,19 @@ pub trait LayoutCanvasRenderingContext2DHelpers {
 impl LayoutCanvasRenderingContext2DHelpers for LayoutDom<CanvasRenderingContext2D> {
     #[allow(unsafe_code)]
     unsafe fn get_ipc_renderer(&self) -> IpcSender<CanvasMsg> {
-        (*self.unsafe_get()).ipc_renderer.clone()
+        (*self.unsafe_get())
+            .canvas_state
+            .borrow_for_layout()
+            .ipc_renderer
+            .clone()
     }
 
     #[allow(unsafe_code)]
     unsafe fn get_canvas_id(&self) -> CanvasId {
-        (*self.unsafe_get()).canvas_id.clone()
+        (*self.unsafe_get())
+            .canvas_state
+            .borrow_for_layout()
+            .get_canvas_id()
     }
 }
 
@@ -747,26 +804,20 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
 
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-fillrect
     fn FillRect(&self, x: f64, y: f64, width: f64, height: f64) {
-        if let Some(rect) = self.create_drawable_rect(x, y, width, height) {
-            self.send_canvas_2d_msg(Canvas2dMsg::FillRect(rect));
-            self.mark_as_dirty();
-        }
+        self.canvas_state.borrow().FillRect(x, y, width, height);
+        self.mark_as_dirty();
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-clearrect
     fn ClearRect(&self, x: f64, y: f64, width: f64, height: f64) {
-        if let Some(rect) = self.create_drawable_rect(x, y, width, height) {
-            self.send_canvas_2d_msg(Canvas2dMsg::ClearRect(rect));
-            self.mark_as_dirty();
-        }
+        self.canvas_state.borrow().ClearRect(x, y, width, height);
+        self.mark_as_dirty();
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokerect
     fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) {
-        if let Some(rect) = self.create_drawable_rect(x, y, width, height) {
-            self.send_canvas_2d_msg(Canvas2dMsg::StrokeRect(rect));
-            self.mark_as_dirty();
-        }
+        self.canvas_state.borrow().StrokeRect(x, y, width, height);
+        self.mark_as_dirty();
     }
 
     // https://html.spec.whatwg.org/multipage/#dom-context-2d-beginpath
@@ -1458,8 +1509,10 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
 impl Drop for CanvasRenderingContext2D {
     fn drop(&mut self) {
         if let Err(err) = self
+            .canvas_state
+            .borrow()
             .ipc_renderer
-            .send(CanvasMsg::Close(self.get_canvas_id()))
+            .send(CanvasMsg::Close(self.canvas_state.borrow().get_canvas_id()))
         {
             warn!("Could not close canvas: {}", err)
         }
diff --git a/components/script/dom/offscreencanvasrenderingcontext2d.rs b/components/script/dom/offscreencanvasrenderingcontext2d.rs
index a02d2d4a85b..8dc4c3063a7 100644
--- a/components/script/dom/offscreencanvasrenderingcontext2d.rs
+++ b/components/script/dom/offscreencanvasrenderingcontext2d.rs
@@ -2,10 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::OffscreenCanvasRenderingContext2DBinding;
 use crate::dom::bindings::codegen::Bindings::OffscreenCanvasRenderingContext2DBinding::OffscreenCanvasRenderingContext2DMethods;
 use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
 use crate::dom::bindings::root::{Dom, DomRoot};
+use crate::dom::canvasrenderingcontext2d::CanvasState;
 use crate::dom::globalscope::GlobalScope;
 use crate::dom::offscreencanvas::OffscreenCanvas;
 use dom_struct::dom_struct;
@@ -15,33 +17,35 @@ use euclid::Size2D;
 pub struct OffscreenCanvasRenderingContext2D {
     reflector_: Reflector,
     canvas: Option<Dom<OffscreenCanvas>>,
+    canvas_state: DomRefCell<CanvasState>,
 }
 
 impl OffscreenCanvasRenderingContext2D {
     pub fn new_inherited(
-        _global: &GlobalScope,
+        global: &GlobalScope,
         canvas: Option<&OffscreenCanvas>,
-        _size: Size2D<u64>,
+        size: Size2D<u64>,
     ) -> OffscreenCanvasRenderingContext2D {
         OffscreenCanvasRenderingContext2D {
             reflector_: Reflector::new(),
             canvas: canvas.map(Dom::from_ref),
+            canvas_state: DomRefCell::new(CanvasState::new(global, size)),
         }
     }
 
     pub fn new(
-        _global: &GlobalScope,
+        global: &GlobalScope,
         canvas: &OffscreenCanvas,
-        _size: Size2D<u64>,
+        size: Size2D<u64>,
     ) -> DomRoot<OffscreenCanvasRenderingContext2D> {
         let boxed = Box::new(OffscreenCanvasRenderingContext2D::new_inherited(
-            _global,
+            global,
             Some(canvas),
-            _size,
+            size,
         ));
         reflect_dom_object(
             boxed,
-            _global,
+            global,
             OffscreenCanvasRenderingContext2DBinding::Wrap,
         )
     }
@@ -52,4 +56,19 @@ impl OffscreenCanvasRenderingContext2DMethods for OffscreenCanvasRenderingContex
     fn Canvas(&self) -> DomRoot<OffscreenCanvas> {
         DomRoot::from_ref(self.canvas.as_ref().expect("No canvas."))
     }
+
+    // https://html.spec.whatwg.org/multipage/#dom-context-2d-fillrect
+    fn FillRect(&self, x: f64, y: f64, width: f64, height: f64) {
+        self.canvas_state.borrow().FillRect(x, y, width, height);
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-context-2d-clearrect
+    fn ClearRect(&self, x: f64, y: f64, width: f64, height: f64) {
+        self.canvas_state.borrow().ClearRect(x, y, width, height);
+    }
+
+    // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokerect
+    fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) {
+        self.canvas_state.borrow().StrokeRect(x, y, width, height);
+    }
 }
diff --git a/components/script/dom/webidls/CanvasRenderingContext2D.webidl b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
index 5d68ce28fbb..0f47448b84c 100644
--- a/components/script/dom/webidls/CanvasRenderingContext2D.webidl
+++ b/components/script/dom/webidls/CanvasRenderingContext2D.webidl
@@ -111,7 +111,7 @@ interface CanvasFilters {
   //attribute DOMString filter; // (default "none")
 };
 
-[Exposed=(PaintWorklet, Window), NoInterfaceObject]
+[Exposed=(PaintWorklet, Window, Worker), NoInterfaceObject]
 interface CanvasRect {
   // rects
   void clearRect(unrestricted double x, unrestricted double y, unrestricted double w, unrestricted double h);
diff --git a/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl b/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl
index ce113586970..ef1d494e73e 100644
--- a/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl
+++ b/components/script/dom/webidls/OffscreenCanvasRenderingContext2D.webidl
@@ -8,6 +8,8 @@ interface OffscreenCanvasRenderingContext2D {
   //void commit();
   readonly attribute OffscreenCanvas canvas;
 };
+OffscreenCanvasRenderingContext2D implements CanvasRect;
+
 
 //OffscreenCanvasRenderingContext2D includes CanvasState;
 //OffscreenCanvasRenderingContext2D includes CanvasTransform;
@@ -16,7 +18,6 @@ interface OffscreenCanvasRenderingContext2D {
 //OffscreenCanvasRenderingContext2D includes CanvasFillStrokeStyles;
 //OffscreenCanvasRenderingContext2D includes CanvasShadowStyles;
 //OffscreenCanvasRenderingContext2D includes CanvasFilters;
-//OffscreenCanvasRenderingContext2D includes CanvasRect;
 //OffscreenCanvasRenderingContext2D includes CanvasDrawPath;
 //OffscreenCanvasRenderingContext2D includes CanvasText;
 //OffscreenCanvasRenderingContext2D includes CanvasDrawImage;
@@ -24,3 +25,7 @@ interface OffscreenCanvasRenderingContext2D {
 //OffscreenCanvasRenderingContext2D includes CanvasPathDrawingStyles;
 //OffscreenCanvasRenderingContext2D includes CanvasTextDrawingStyles;
 //OffscreenCanvasRenderingContext2D includes CanvasPath;
+
+
+
+
diff --git a/components/script_traits/script_msg.rs b/components/script_traits/script_msg.rs
index bb7619aa1a7..48862e8378f 100644
--- a/components/script_traits/script_msg.rs
+++ b/components/script_traits/script_msg.rs
@@ -118,7 +118,7 @@ pub enum ScriptMsg {
     ChangeRunningAnimationsState(AnimationState),
     /// Requests that a new 2D canvas thread be created. (This is done in the constellation because
     /// 2D canvases may use the GPU and we don't want to give untrusted content access to the GPU.)
-    CreateCanvasPaintThread(Size2D<u32>, IpcSender<(IpcSender<CanvasMsg>, CanvasId)>),
+    CreateCanvasPaintThread(Size2D<u64>, IpcSender<(IpcSender<CanvasMsg>, CanvasId)>),
     /// Notifies the constellation that this frame has received focus.
     Focus,
     /// Requests that the constellation retrieve the current contents of the clipboard
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.html.ini
deleted file mode 100644
index 533dcd659e1..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.globalAlpha.image.html]
-  [OffscreenCanvas test: 2d.composite.globalAlpha.image]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js.ini
deleted file mode 100644
index a2408e6f9d1..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.image.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.globalAlpha.image.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html.ini
deleted file mode 100644
index e2e341564b4..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.globalAlpha.imagepattern.html]
-  [OffscreenCanvas test: 2d.composite.globalAlpha.imagepattern]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js.ini
deleted file mode 100644
index 234a3f006c9..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.globalAlpha.imagepattern.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.globalAlpha.imagepattern.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.html.ini
deleted file mode 100644
index e9f06c605f2..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.copy.html]
-  [OffscreenCanvas test: 2d.composite.image.copy]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.worker.js.ini
deleted file mode 100644
index ec00c96fb2b..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.copy.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.copy.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.html.ini
deleted file mode 100644
index 5022f8908d6..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.destination-atop.html]
-  [OffscreenCanvas test: 2d.composite.image.destination-atop]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js.ini
deleted file mode 100644
index 2046175aac3..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-atop.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.destination-atop.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.html.ini
deleted file mode 100644
index f9e632b5462..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.destination-in.html]
-  [OffscreenCanvas test: 2d.composite.image.destination-in]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js.ini
deleted file mode 100644
index 32908c3c484..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-in.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.destination-in.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.html.ini
deleted file mode 100644
index d5dbd4bf438..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.destination-out.html]
-  [OffscreenCanvas test: 2d.composite.image.destination-out]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js.ini
deleted file mode 100644
index 8060822fb5e..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-out.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.destination-out.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.html.ini
deleted file mode 100644
index 743325246ab..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.destination-over.html]
-  [OffscreenCanvas test: 2d.composite.image.destination-over]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js.ini
deleted file mode 100644
index a87842653ea..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.destination-over.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.destination-over.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.html.ini
deleted file mode 100644
index 48f3c6461ba..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.lighter.html]
-  [OffscreenCanvas test: 2d.composite.image.lighter]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.worker.js.ini
deleted file mode 100644
index fb45ac0c1a9..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.lighter.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.lighter.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.html.ini
deleted file mode 100644
index 5980e0f0a2a..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.source-atop.html]
-  [OffscreenCanvas test: 2d.composite.image.source-atop]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js.ini
deleted file mode 100644
index c784780d9b4..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-atop.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.source-atop.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.html.ini
deleted file mode 100644
index 3b216c32297..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.source-in.html]
-  [OffscreenCanvas test: 2d.composite.image.source-in]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.worker.js.ini
deleted file mode 100644
index 663578f318f..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-in.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.source-in.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.html.ini
deleted file mode 100644
index 89cc95f0485..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.source-out.html]
-  [OffscreenCanvas test: 2d.composite.image.source-out]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.worker.js.ini
deleted file mode 100644
index 0f6b42d6e01..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-out.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.source-out.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.html.ini
deleted file mode 100644
index 5f4a050baf6..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.source-over.html]
-  [OffscreenCanvas test: 2d.composite.image.source-over]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.worker.js.ini
deleted file mode 100644
index 31c0edae3dc..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.source-over.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.source-over.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.html.ini
deleted file mode 100644
index d41764c974f..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.xor.html]
-  [OffscreenCanvas test: 2d.composite.image.xor]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.worker.js.ini
deleted file mode 100644
index d0f98d53471..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.image.xor.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.image.xor.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html.ini
deleted file mode 100644
index c73ed92eab0..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.image.copy.html]
-  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js.ini
deleted file mode 100644
index d2f0f5260ea..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.copy.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.image.copy.worker.html]
-  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html.ini
deleted file mode 100644
index 82fb8a5ff86..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.image.destination-atop.html]
-  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js.ini
deleted file mode 100644
index 7abafe82c31..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-atop.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.image.destination-atop.worker.html]
-  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html.ini
deleted file mode 100644
index 57e53fd0465..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.image.destination-in.html]
-  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js.ini
deleted file mode 100644
index 0baa1cf152b..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.destination-in.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.image.destination-in.worker.html]
-  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html.ini
deleted file mode 100644
index 01e4017ddc6..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.image.source-in.html]
-  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js.ini
deleted file mode 100644
index 5453fbb0c6f..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-in.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.image.source-in.worker.html]
-  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html.ini
deleted file mode 100644
index 74aa8b83767..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.image.source-out.html]
-  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js.ini
deleted file mode 100644
index 039cba1944f..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.image.source-out.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.image.source-out.worker.html]
-  [drawImage() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html.ini
deleted file mode 100644
index 10cfce57e50..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.pattern.copy.html]
-  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js.ini
deleted file mode 100644
index 4faf4ace88f..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.copy.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.pattern.copy.worker.html]
-  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini
deleted file mode 100644
index 083fdd045f3..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.pattern.destination-atop.html]
-  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js.ini
deleted file mode 100644
index dc344e47931..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-atop.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.pattern.destination-atop.worker.html]
-  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
deleted file mode 100644
index ebd422dd61f..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.pattern.destination-in.html]
-  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js.ini
deleted file mode 100644
index e821c9a2fe2..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.destination-in.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.pattern.destination-in.worker.html]
-  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html.ini
deleted file mode 100644
index d3efc0ef626..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.pattern.source-in.html]
-  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js.ini
deleted file mode 100644
index 761a5faed6a..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-in.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.pattern.source-in.worker.html]
-  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html.ini
deleted file mode 100644
index 6d77fdf24b4..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.pattern.source-out.html]
-  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js.ini
deleted file mode 100644
index 543eddf7f06..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/compositing/2d.composite.uncovered.pattern.source-out.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.composite.uncovered.pattern.source-out.worker.html]
-  [Pattern fill() draws pixels not covered by the source object as (0,0,0,0), and does not leave the pixels unchanged.]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html.ini
deleted file mode 100644
index 6eb16015d70..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.5arg.html]
-  [OffscreenCanvas test: 2d.drawImage.5arg]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js.ini
deleted file mode 100644
index 45de12fade2..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.5arg.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.5arg.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html.ini
deleted file mode 100644
index f312f1589b8..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.9arg.basic.html]
-  [OffscreenCanvas test: 2d.drawImage.9arg.basic]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js.ini
deleted file mode 100644
index 2ff0b98dcb5..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.basic.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.9arg.basic.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html.ini
deleted file mode 100644
index a02165fabe7..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.9arg.destpos.html]
-  [OffscreenCanvas test: 2d.drawImage.9arg.destpos]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js.ini
deleted file mode 100644
index 3d4d5011b5f..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destpos.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.9arg.destpos.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html.ini
deleted file mode 100644
index 9d66e1bd341..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.9arg.destsize.html]
-  [OffscreenCanvas test: 2d.drawImage.9arg.destsize]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js.ini
deleted file mode 100644
index a97dfe3464c..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.destsize.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.9arg.destsize.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html.ini
deleted file mode 100644
index 3e8e707a8be..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.9arg.sourcepos.html]
-  [OffscreenCanvas test: 2d.drawImage.9arg.sourcepos]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js.ini
deleted file mode 100644
index 3ec5cbbadc9..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcepos.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.9arg.sourcepos.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html.ini
deleted file mode 100644
index 44ad1e2efb0..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.9arg.sourcesize.html]
-  [OffscreenCanvas test: 2d.drawImage.9arg.sourcesize]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js.ini
deleted file mode 100644
index 150dc88d58e..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.9arg.sourcesize.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.9arg.sourcesize.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html.ini
deleted file mode 100644
index 0b04a0d852d..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.alpha.html]
-  [OffscreenCanvas test: 2d.drawImage.alpha]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js.ini
deleted file mode 100644
index 93ca873d5aa..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.alpha.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.alpha.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html.ini
deleted file mode 100644
index 0d1eb846146..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.composite.html]
-  [OffscreenCanvas test: 2d.drawImage.composite]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js.ini
deleted file mode 100644
index 14975992b26..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.composite.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.composite.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html.ini
deleted file mode 100644
index d9c00e020cb..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.negativedest.html]
-  [Negative destination width/height represents the correct rectangle]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js.ini
deleted file mode 100644
index 31b9ec54018..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedest.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.negativedest.worker.html]
-  [Negative destination width/height represents the correct rectangle]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html.ini
deleted file mode 100644
index cf30b485857..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.negativedir.html]
-  [Negative dimensions do not affect the direction of the image]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js.ini
deleted file mode 100644
index b789fbb639b..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativedir.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.negativedir.worker.html]
-  [Negative dimensions do not affect the direction of the image]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html.ini
deleted file mode 100644
index fe6fe1317b3..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.negativesource.html]
-  [Negative source width/height represents the correct rectangle]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js.ini
deleted file mode 100644
index d20b4175b81..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.negativesource.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.negativesource.worker.html]
-  [Negative source width/height represents the correct rectangle]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html.ini
deleted file mode 100644
index 968631ac458..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.nonfinite.html]
-  [drawImage() with Infinity/NaN is ignored]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js.ini
deleted file mode 100644
index d88e35b08a4..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nonfinite.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.nonfinite.worker.html]
-  [drawImage() with Infinity/NaN is ignored]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html.ini
deleted file mode 100644
index aac6b35b06d..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.nowrap.html]
-  [Stretched images do not get pixels wrapping around the edges]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js.ini
deleted file mode 100644
index 61d2ac9b727..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.nowrap.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.nowrap.worker.html]
-  [Stretched images do not get pixels wrapping around the edges]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini
deleted file mode 100644
index ead7f5f5ad8..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.zerosource.html]
-  [drawImage with zero-sized source rectangle throws INDEX_SIZE_ERR]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html.ini
deleted file mode 100644
index c1ee61dcd49..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.zerosource.image.html]
-  [drawImage with zero-sized source rectangle from image throws INDEX_SIZE_ERR]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js.ini
deleted file mode 100644
index 341b1b43e6f..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.image.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.zerosource.image.worker.html]
-  [drawImage with zero-sized source rectangle from image throws INDEX_SIZE_ERR]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js.ini
deleted file mode 100644
index 9160e3ad144..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/drawing-images-to-the-canvas/2d.drawImage.zerosource.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.drawImage.zerosource.worker.html]
-  [drawImage with zero-sized source rectangle throws INDEX_SIZE_ERR]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html.ini
deleted file mode 100644
index 62a146b9e10..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.basic.image.html]
-  [OffscreenCanvas test: 2d.pattern.basic.image]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js.ini
deleted file mode 100644
index 07fb18f36da..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.basic.image.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.basic.image.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html.ini
deleted file mode 100644
index 43247565daa..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.norepeat.basic.html]
-  [OffscreenCanvas test: 2d.pattern.paint.norepeat.basic]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js.ini
deleted file mode 100644
index 18a0858cc72..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.basic.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.norepeat.basic.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html.ini
deleted file mode 100644
index aabfaba54a4..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.norepeat.coord1.html]
-  [OffscreenCanvas test: 2d.pattern.paint.norepeat.coord1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js.ini
deleted file mode 100644
index 482d993483c..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord1.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.norepeat.coord1.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html.ini
deleted file mode 100644
index a3c5fc7486a..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.norepeat.coord3.html]
-  [OffscreenCanvas test: 2d.pattern.paint.norepeat.coord3]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js.ini
deleted file mode 100644
index 7c26ae9c4bb..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.coord3.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.norepeat.coord3.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html.ini
deleted file mode 100644
index 8311cbfbc03..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.norepeat.outside.html]
-  [OffscreenCanvas test: 2d.pattern.paint.norepeat.outside]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js.ini
deleted file mode 100644
index 1ae5e67ad59..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.norepeat.outside.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.norepeat.outside.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html.ini
deleted file mode 100644
index 947172da5d2..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.orientation.image.html]
-  [Image patterns do not get flipped when painted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js.ini
deleted file mode 100644
index 3ae068f7c81..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.orientation.image.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.orientation.image.worker.html]
-  [Image patterns do not get flipped when painted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html.ini
deleted file mode 100644
index f5af5115e4c..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeat.basic.html]
-  [OffscreenCanvas test: 2d.pattern.paint.repeat.basic]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js.ini
deleted file mode 100644
index 2258a149ec2..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.basic.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeat.basic.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html.ini
deleted file mode 100644
index 584ece267cc..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeat.coord1.html]
-  [OffscreenCanvas test: 2d.pattern.paint.repeat.coord1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js.ini
deleted file mode 100644
index dfe2f7b03ee..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.coord1.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeat.coord1.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html.ini
deleted file mode 100644
index ccdaaa1df88..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeat.outside.html]
-  [OffscreenCanvas test: 2d.pattern.paint.repeat.outside]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js.ini
deleted file mode 100644
index 62f773680be..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeat.outside.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeat.outside.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html.ini
deleted file mode 100644
index 354a21b922c..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeatx.basic.html]
-  [OffscreenCanvas test: 2d.pattern.paint.repeatx.basic]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js.ini
deleted file mode 100644
index a70d19497c6..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.basic.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeatx.basic.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html.ini
deleted file mode 100644
index 288a61063e5..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeatx.coord1.html]
-  [OffscreenCanvas test: 2d.pattern.paint.repeatx.coord1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js.ini
deleted file mode 100644
index d5e57212449..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.coord1.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeatx.coord1.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html.ini
deleted file mode 100644
index a27a8dcbbc0..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeatx.outside.html]
-  [OffscreenCanvas test: 2d.pattern.paint.repeatx.outside]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js.ini
deleted file mode 100644
index ee3cdd3b8d0..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeatx.outside.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeatx.outside.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html.ini
deleted file mode 100644
index 028fe614e48..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeaty.basic.html]
-  [OffscreenCanvas test: 2d.pattern.paint.repeaty.basic]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js.ini
deleted file mode 100644
index 880bd580da5..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.basic.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeaty.basic.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html.ini
deleted file mode 100644
index f2110e702ba..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeaty.coord1.html]
-  [OffscreenCanvas test: 2d.pattern.paint.repeaty.coord1]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js.ini
deleted file mode 100644
index 790df4ff997..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.coord1.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeaty.coord1.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html.ini
deleted file mode 100644
index 035bd9b0101..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeaty.outside.html]
-  [OffscreenCanvas test: 2d.pattern.paint.repeaty.outside]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js.ini
deleted file mode 100644
index 60bbba05f78..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.paint.repeaty.outside.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.paint.repeaty.outside.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html.ini
deleted file mode 100644
index 89b79ac53fa..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.repeat.empty.html]
-  [OffscreenCanvas test: 2d.pattern.repeat.empty]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js.ini
deleted file mode 100644
index 46202a09c10..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/fill-and-stroke-styles/2d.pattern.repeat.empty.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.repeat.empty.worker.html]
-  [2d]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.html.ini
deleted file mode 100644
index 957d04b99f6..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.alpha.html]
-  [Shadows are drawn correctly for partially-transparent images]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js.ini
deleted file mode 100644
index 07edc88f46d..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.alpha.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.alpha.worker.html]
-  [Shadows are drawn correctly for partially-transparent images]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.html.ini
deleted file mode 100644
index 81fa284a386..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.basic.html]
-  [Shadows are drawn for images]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.worker.js.ini
deleted file mode 100644
index 40c817c2cac..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.basic.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.basic.worker.html]
-  [Shadows are drawn for images]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.html.ini
deleted file mode 100644
index 8cba6d0463e..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.scale.html]
-  [Shadows are drawn correctly for scaled images]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.worker.js.ini
deleted file mode 100644
index 79a1915a65f..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.scale.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.scale.worker.html]
-  [Shadows are drawn correctly for scaled images]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.html.ini
deleted file mode 100644
index cd025c01c7a..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.section.html]
-  [Shadows are not drawn for areas outside image source rectangles]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.worker.js.ini
deleted file mode 100644
index 6944b590506..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.section.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.section.worker.html]
-  [Shadows are not drawn for areas outside image source rectangles]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.html.ini
deleted file mode 100644
index d7b14dd0ccd..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.transparent.1.html]
-  [Shadows are not drawn for transparent images]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js.ini
deleted file mode 100644
index ecd1b8c8ad9..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.1.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.transparent.1.worker.html]
-  [Shadows are not drawn for transparent images]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.html.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.html.ini
deleted file mode 100644
index fdc1a6c0a13..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.transparent.2.html]
-  [Shadows are not drawn for transparent parts of images]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js.ini b/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js.ini
deleted file mode 100644
index 217876dd3ab..00000000000
--- a/tests/wpt/metadata/offscreen-canvas/shadows/2d.shadow.image.transparent.2.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.shadow.image.transparent.2.worker.html]
-  [Shadows are not drawn for transparent parts of images]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/offscreencanvas.commit.w.html.ini b/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/offscreencanvas.commit.w.html.ini
index b6e408b9b86..f654a376e62 100644
--- a/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/offscreencanvas.commit.w.html.ini
+++ b/tests/wpt/metadata/offscreen-canvas/the-offscreen-canvas/offscreencanvas.commit.w.html.ini
@@ -1,8 +1,4 @@
 [offscreencanvas.commit.w.html]
-  expected: ERROR
   [Test that calling OffscreenCanvas's commit pushes its contents to its placeholder.]
     expected: FAIL
 
-  [Test that calling commit on an OffscreenCanvas that is not transferred from a HTMLCanvasElement throws an exception in a worker.]
-    expected: FAIL
-