diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index a18eedebfb8..95e5c43af66 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -167,13 +167,10 @@ impl HTMLImageElement {
     // https://html.spec.whatwg.org/multipage/#check-the-usability-of-the-image-argument
     pub fn is_usable(&self) -> Fallible<bool> {
         // If image has an intrinsic width or intrinsic height (or both) equal to zero, then return bad.
-        match &self.current_request.borrow().image {
-            Some(image) => {
-                if image.width == 0 || image.height == 0 {
-                    return Ok(false);
-                }
-            },
-            None => return Ok(false),
+        if let Some(image) = &self.current_request.borrow().image {
+            if image.width == 0 || image.height == 0 {
+                return Ok(false);
+            }
         }
 
         match self.current_request.borrow().state {
diff --git a/tests/wpt/metadata-layout-2020/2dcontext/drawing-images-to-the-canvas/2d.drawImage.broken.html.ini b/tests/wpt/metadata-layout-2020/2dcontext/drawing-images-to-the-canvas/2d.drawImage.broken.html.ini
new file mode 100644
index 00000000000..12725358b60
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/2dcontext/drawing-images-to-the-canvas/2d.drawImage.broken.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.broken.html]
+  [Canvas test: 2d.drawImage.broken]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.broken.html.ini b/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.broken.html.ini
new file mode 100644
index 00000000000..ff269ceac8c
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.broken.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.image.broken.html]
+  [Canvas test: 2d.pattern.image.broken]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html.ini b/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html.ini
deleted file mode 100644
index d1cbf15e597..00000000000
--- a/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.image.nonexistent.html]
-  [Canvas test: 2d.pattern.image.nonexistent]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.zeroheight.html.ini b/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.zeroheight.html.ini
new file mode 100644
index 00000000000..06e296d0b50
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.zeroheight.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.image.zeroheight.html]
+  [Canvas test: 2d.pattern.image.zeroheight]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.zerowidth.html.ini b/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.zerowidth.html.ini
new file mode 100644
index 00000000000..2c8d1ad8ffe
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/2dcontext/fill-and-stroke-styles/2d.pattern.image.zerowidth.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.image.zerowidth.html]
+  [Canvas test: 2d.pattern.image.zerowidth]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/2d.drawImage.broken.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/2d.drawImage.broken.html.ini
new file mode 100644
index 00000000000..12725358b60
--- /dev/null
+++ b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/2d.drawImage.broken.html.ini
@@ -0,0 +1,4 @@
+[2d.drawImage.broken.html]
+  [Canvas test: 2d.drawImage.broken]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.broken.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.broken.html.ini
new file mode 100644
index 00000000000..ff269ceac8c
--- /dev/null
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.broken.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.image.broken.html]
+  [Canvas test: 2d.pattern.image.broken]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html.ini
deleted file mode 100644
index d1cbf15e597..00000000000
--- a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.nonexistent.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[2d.pattern.image.nonexistent.html]
-  [Canvas test: 2d.pattern.image.nonexistent]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.zeroheight.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.zeroheight.html.ini
new file mode 100644
index 00000000000..06e296d0b50
--- /dev/null
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.zeroheight.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.image.zeroheight.html]
+  [Canvas test: 2d.pattern.image.zeroheight]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.zerowidth.html.ini b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.zerowidth.html.ini
new file mode 100644
index 00000000000..2c8d1ad8ffe
--- /dev/null
+++ b/tests/wpt/metadata/2dcontext/fill-and-stroke-styles/2d.pattern.image.zerowidth.html.ini
@@ -0,0 +1,4 @@
+[2d.pattern.image.zerowidth.html]
+  [Canvas test: 2d.pattern.image.zerowidth]
+    expected: FAIL
+