From e0837134ffad28af81bbe2ca3a7a51e3ffb082ca Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 4 Jan 2017 15:12:15 -0500
Subject: [PATCH] Remove synchronous forks of drawImage tests, and enable
 proper asynchronous drawImage tests.

---
 .../drawimage_html_image_1.html.ini           |   3 -
 .../drawimage_html_image_10.html.ini          |   3 -
 .../drawimage_html_image_11.html.ini          |   3 -
 .../drawimage_html_image_12.html.ini          |   3 -
 .../drawimage_html_image_13.html.ini          |   3 -
 .../drawimage_html_image_2.html.ini           |   3 -
 .../drawimage_html_image_3.html.ini           |   3 -
 .../drawimage_html_image_4.html.ini           |   3 -
 .../drawimage_html_image_5.html.ini           |   3 -
 .../drawimage_html_image_6.html.ini           |   3 -
 .../drawimage_html_image_7.html.ini           |   3 -
 .../drawimage_html_image_8.html.ini           |   3 -
 .../drawimage_html_image_9.html.ini           |   3 -
 tests/wpt/metadata/MANIFEST.json              |  22 +-
 .../current-pixel-density/basic.html.ini      |   3 -
 tests/wpt/mozilla/meta/MANIFEST.json          | 327 +-----------------
 .../canvas/drawimage_html_image_1.html        |  29 --
 .../canvas/drawimage_html_image_10.html       |  33 --
 .../canvas/drawimage_html_image_10_ref.html   |  19 -
 .../canvas/drawimage_html_image_11.html       |  31 --
 .../canvas/drawimage_html_image_11_ref.html   |  19 -
 .../canvas/drawimage_html_image_12.html       |  31 --
 .../canvas/drawimage_html_image_12_ref.html   |  32 --
 .../canvas/drawimage_html_image_13.html       |  39 ---
 .../canvas/drawimage_html_image_13_ref.html   |  20 --
 .../canvas/drawimage_html_image_1_ref.html    |  19 -
 .../canvas/drawimage_html_image_2.html        |  30 --
 .../canvas/drawimage_html_image_2_ref.html    |  23 --
 .../canvas/drawimage_html_image_3.html        |  30 --
 .../canvas/drawimage_html_image_3_ref.html    |  23 --
 .../canvas/drawimage_html_image_4.html        |  31 --
 .../canvas/drawimage_html_image_4_ref.html    |  29 --
 .../canvas/drawimage_html_image_5.html        |  30 --
 .../canvas/drawimage_html_image_5_ref.html    |  38 --
 .../canvas/drawimage_html_image_6.html        |  31 --
 .../canvas/drawimage_html_image_6_ref.html    |  25 --
 .../canvas/drawimage_html_image_7.html        |  31 --
 .../canvas/drawimage_html_image_7_ref.html    |  35 --
 .../canvas/drawimage_html_image_8.html        |  31 --
 .../canvas/drawimage_html_image_8_ref.html    |  35 --
 .../canvas/drawimage_html_image_9.html        |  38 --
 .../canvas/drawimage_html_image_9_ref.html    |  19 -
 .../fill_and_stroke_getters_setters.html      |  16 +-
 .../drawimage_html_image_1.html               |   2 +
 .../drawimage_html_image_10.html              |   2 +
 .../drawimage_html_image_11.html              |   2 +
 .../drawimage_html_image_12.html              |   2 +
 .../drawimage_html_image_2.html               |   2 +
 .../drawimage_html_image_3.html               |   2 +
 .../drawimage_html_image_4.html               |   2 +
 .../drawimage_html_image_5.html               |   2 +
 .../drawimage_html_image_6.html               |   2 +
 .../drawimage_html_image_7.html               |   2 +
 .../drawimage_html_image_8.html               |   2 +
 54 files changed, 44 insertions(+), 1136 deletions(-)
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html.ini
 delete mode 100644 tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html.ini
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_1.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_10.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_10_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_11.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_11_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_12.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_12_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_13.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_13_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_1_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_2.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_2_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_3.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_3_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_4.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_4_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_5.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_5_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_6.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_6_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_7.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_7_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_8.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_8_ref.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_9.html
 delete mode 100644 tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_9_ref.html

diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html.ini
deleted file mode 100644
index 396d39eeb09..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_1.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html.ini
deleted file mode 100644
index 4dcc60a0824..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_10.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html.ini
deleted file mode 100644
index f26feab7168..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_11.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html.ini
deleted file mode 100644
index 8eb54f816a9..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_12.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html.ini
deleted file mode 100644
index 856288b3d70..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_13.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html.ini
deleted file mode 100644
index 3ba92dd7d75..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_2.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html.ini
deleted file mode 100644
index 277d697527d..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_3.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html.ini
deleted file mode 100644
index 6ced959e23b..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_4.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html.ini
deleted file mode 100644
index 8cd1d610a01..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_5.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html.ini
deleted file mode 100644
index 8d2dfb702fb..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_6.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html.ini
deleted file mode 100644
index e24ff5c2fae..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_7.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html.ini
deleted file mode 100644
index 13688c76798..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_8.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html.ini b/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html.ini
deleted file mode 100644
index 0cf6369939f..00000000000
--- a/tests/wpt/metadata/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[drawimage_html_image_9.html]
-  type: reftest
-  disabled: see _mozilla
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index edbb4f2386e..587ce32e6f0 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -130647,11 +130647,11 @@
    "support"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html": [
-   "8cff9e2344fbbe84b2ce315f260e69c6ad92dd51",
+   "461f306d3083248243d7e5a4aac376be59adefd3",
    "reftest"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html": [
-   "ca239d9a40410e4331863f2d11daabae3e590af3",
+   "970d92ab928086b48dce22c2a873a0e5adde1355",
    "reftest"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10_ref.html": [
@@ -130659,7 +130659,7 @@
    "support"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html": [
-   "04415ce09b3b52561f5d179e7a6a8050199189c9",
+   "9faf39bcfb3ed5f86b78fabcb8566386ca519b6e",
    "reftest"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11_ref.html": [
@@ -130667,7 +130667,7 @@
    "support"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html": [
-   "efee9a63933437315c9adec573113d8dee786659",
+   "8f4e8952d6959d7ad3c32ca02a6b91eb29c9bc28",
    "reftest"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12_ref.html": [
@@ -130687,7 +130687,7 @@
    "support"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html": [
-   "b03f11e43e455e2d1f453ecc2a4de00e00005ebc",
+   "310d7bf19699754d6248599820e17850f0a8de2c",
    "reftest"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2_ref.html": [
@@ -130695,7 +130695,7 @@
    "support"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html": [
-   "134fa026f56880acb111a8e91efe3a8bcc03bb6b",
+   "368a40dff341c6677a23c5ffeb4a69dc447360e6",
    "reftest"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3_ref.html": [
@@ -130703,7 +130703,7 @@
    "support"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html": [
-   "5d7254f7bbc8c6feffb2a4fcfeecb06fe6ed3d6c",
+   "a0aa4f32aeb8b0b4178b0efa1446455387f281eb",
    "reftest"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4_ref.html": [
@@ -130711,7 +130711,7 @@
    "support"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html": [
-   "6a02b961aa4a5eb013366cd85dbea06fd2c08da0",
+   "7d92f1f10e7bc29564d7a8b8e49d42f552ad0782",
    "reftest"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5_ref.html": [
@@ -130719,7 +130719,7 @@
    "support"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html": [
-   "ce7cbe3b76274177301acca263f7cdd6c4033aa1",
+   "c60e69eaf1e92c6e2cd53936e52683054fbddd32",
    "reftest"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6_ref.html": [
@@ -130727,7 +130727,7 @@
    "support"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html": [
-   "f5469ba799e0845bc59766d76713ee052f3e6966",
+   "d305b82f0329bbedd5e950287619e8a7dc926536",
    "reftest"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7_ref.html": [
@@ -130735,7 +130735,7 @@
    "support"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html": [
-   "37958b2fb55bd90567c7c0b64b599165b20992b9",
+   "00a95cb5ad9f256101ea65f296a201d7074ef9f5",
    "reftest"
   ],
   "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8_ref.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
index 1435a098642..2aa027d16bf 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/current-pixel-density/basic.html.ini
@@ -1,8 +1,5 @@
 [basic.html]
   type: testharness
-  [<img src="/images/green-256x256.png" data-expect="256">]
-    expected: FAIL
-
   [<img srcset="/images/green-256x256.png 1x" data-expect="256">]
     expected: FAIL
 
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 62275196fbf..96de8d62563 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -6317,162 +6317,6 @@
      {}
     ]
    ],
-   "mozilla/canvas/drawimage_html_image_1.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_1.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_1_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_10.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_10.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_10_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_11.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_11.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_11_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_12.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_12.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_12_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_13.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_13.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_13_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_2.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_2.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_2_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_3.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_3.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_3_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_4.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_4.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_4_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_5.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_5.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_5_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_6.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_6.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_6_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_7.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_7.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_7_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_8.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_8.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_8_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_9.html": [
-    [
-     "/_mozilla/mozilla/canvas/drawimage_html_image_9.html",
-     [
-      [
-       "/_mozilla/mozilla/canvas/drawimage_html_image_9_ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "mozilla/details_ui_closed.html": [
     [
      "/_mozilla/mozilla/details_ui_closed.html",
@@ -9529,71 +9373,6 @@
      {}
     ]
    ],
-   "mozilla/canvas/drawimage_html_image_10_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_11_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_12_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_13_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_1_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_2_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_3_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_4_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_5_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_6_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_7_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_8_ref.html": [
-    [
-     {}
-    ]
-   ],
-   "mozilla/canvas/drawimage_html_image_9_ref.html": [
-    [
-     {}
-    ]
-   ],
    "mozilla/click_prevent.html": [
     [
      {}
@@ -25242,112 +25021,8 @@
    "9fb338806987e20f1bac3c09231e1e5718ac4b23",
    "testharness"
   ],
-  "mozilla/canvas/drawimage_html_image_1.html": [
-   "90ea4e0cfef9731726582e1867d1ced66b6bcc2b",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_10.html": [
-   "51a931987a4e22674014d9e9a3f298029f546bbe",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_10_ref.html": [
-   "9a70c803aaf5bd8a843b18d6d16779575d4dc6f8",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_11.html": [
-   "9b4da400d9486407b834f8f60416a11cfe68f6cf",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_11_ref.html": [
-   "b51c787c97490eed29787cadf62b0c5e5cbd9180",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_12.html": [
-   "a8b04a034bd5fecab74cef610b8320b8d41d5131",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_12_ref.html": [
-   "5529c622869289c1a64987216b525766003d5f8c",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_13.html": [
-   "9a47d53761733409f2582e13d5f1b1f9d9e9046e",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_13_ref.html": [
-   "30150e3530438d42704fda8b3623286658f6c724",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_1_ref.html": [
-   "9a70c803aaf5bd8a843b18d6d16779575d4dc6f8",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_2.html": [
-   "ed1d7f348d2966af1a95c75e49837a72c032b2c6",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_2_ref.html": [
-   "a95c84aace62371b4a58c381acaab51499cdeedb",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_3.html": [
-   "cc8ce7169bdf21905d73597931878422a1cf780c",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_3_ref.html": [
-   "59d699ac4347a4af4246c0333e14a91a201da15c",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_4.html": [
-   "45f850d0062a0cfe3c448420fa9e5fea88b2a90a",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_4_ref.html": [
-   "6204815172949961351ea34906f99d05063bc78f",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_5.html": [
-   "a023a6543b9207f86b3928859f903ca90f57e824",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_5_ref.html": [
-   "839c4941a71523e7b543080aae8722972b20ebbb",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_6.html": [
-   "f9509bb99560ce023f40a0b700b5950bf0a44dda",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_6_ref.html": [
-   "359acc11d83341062450e86162d831a9fc1ae158",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_7.html": [
-   "402c02c6aad4732f4fe31405c00a7acf24c71e10",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_7_ref.html": [
-   "53efd12eca32f7898ddeabdca9b2e61f952b296d",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_8.html": [
-   "17ffa3edbdb9bbf572710e1981732d299062c5ba",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_8_ref.html": [
-   "89f6e5589e3619835d67e8d919ab6a507fb3bbb5",
-   "support"
-  ],
-  "mozilla/canvas/drawimage_html_image_9.html": [
-   "5f89f092758cac8462399555528d8135c6c46692",
-   "reftest"
-  ],
-  "mozilla/canvas/drawimage_html_image_9_ref.html": [
-   "5e4587978bcf32905a2676da269a5a09d7938718",
-   "support"
-  ],
   "mozilla/canvas/fill_and_stroke_getters_setters.html": [
-   "4ae37c115dff4361db2be1849fa5143be19df438",
+   "0a56ed81ad6a34c2f86fcd2296665e5e0466d4b9",
    "testharness"
   ],
   "mozilla/caption.html": [
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_1.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_1.html
deleted file mode 100644
index ea5be1227cf..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_1.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_1_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 100;
-var sourceHeight = 100;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-// 2 arguments, the dest origin is 0,0
-// The source canvas will copied to the 0,0 position of the destination canvas
-destCtx.drawImage(sourceImg, 0, 0);
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_10.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_10.html
deleted file mode 100644
index 68363633382..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_10.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_10_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 128;
-var sourceHeight = 128;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-
-// The destination rectangle is larger than the destination canvas.
-// When the destination rectangle is outside the destination image (the scratch bitmap),
-// the pixels that land outside the scratch bitmap are discarded,
-// as if the destination was an infinite canvas
-// whose rendering was clipped to the dimensions of the scratch bitmap.
-destCtx.drawImage(sourceImg, 0, 0, 512, 512, 0, 0, 256, 256);
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_10_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_10_ref.html
deleted file mode 100644
index 60545df17ff..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_10_ref.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-image: url("../2x2.png");
-  }
-</style>
-<body>
-<div id="destination"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_11.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_11.html
deleted file mode 100644
index d21d3d925b1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_11.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_11_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 128;
-var sourceHeight = 128;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-
-// The source rectangle is larger than the source canvas
-// The source area is clipped to fit the source image
-// and the destination are is clipped in the same proportion
-destCtx.drawImage(sourceImg, 0, 0, 2048, 2048, 0, 0, 800, 800);
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_11_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_11_ref.html
deleted file mode 100644
index 10d8885f2b0..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_11_ref.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-color: #FA6FF2;
-  }
-</style>
-<body>
-<div id="destination" height="100" width="100"></canvas>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_12.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_12.html
deleted file mode 100644
index dc9c8d6bb7d..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_12.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_12_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 128;
-var sourceHeight = 128;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-
-// Negative coordinates of the source rectangle
-// The source area is clipped to fit the source image
-// and the destination area is clipped in the same proportion
-destCtx.drawImage(sourceImg, -25, -25, 50, 50, 0, 0, 50, 50);
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_12_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_12_ref.html
deleted file mode 100644
index 5f6f22111da..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_12_ref.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-color: red;
-  }
-
-  #img {
-    position: relative;
-    top: 0;
-    left: 0;
-    width: 25px;
-    height: 25px;
-    background-color: #FA6FF2;
-  }
-
-</style>
-<body>
-<div id="destination">
-  <div id="img"><div>
-</div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_13.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_13.html
deleted file mode 100644
index 5e663d197b2..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_13.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_13_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 128;
-var sourceHeight = 128;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-
-// The source Image doesn't have a src url defined
-// It should throw an exception because the HTMLImageElement is
-// in the broken state
-// https://html.spec.whatwg.org/multipage/#check-the-usability-of-the-image-argument
-try {
-    destCtx.drawImage(sourceImg, 0, 0);
-    // It makes the test fail if the exception is not thrown
-    destCtx.fillStyle = "#0000FF";
-    destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-}
-catch(err) {
-  console.log("Exception: " + err.message);
-}
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_13_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_13_ref.html
deleted file mode 100644
index 9ac306a5cc6..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_13_ref.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-color: red;
-  }
-</style>
-<body>
-<div id="destination"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_1_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_1_ref.html
deleted file mode 100644
index 60545df17ff..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_1_ref.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-image: url("../2x2.png");
-  }
-</style>
-<body>
-<div id="destination"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_2.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_2.html
deleted file mode 100644
index 9eeaae95ebb..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_2.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_2_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 100;
-var sourceHeight = 100;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-
-// 2 arguments, the dest origin is not 0,0
-// The source image will copied to the 25, 25 position of the destination canvas
-destCtx.drawImage(sourceImg, 25, 25);
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_2_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_2_ref.html
deleted file mode 100644
index c4535283500..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_2_ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-color: red;
-    background-image: url("../2x2.png");
-    background-position: 25px 25px;
-    background-repeat: no-repeat;
-  }
-</style>
-<body>
-<div id="destination"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_3.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_3.html
deleted file mode 100644
index 63b303944ba..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_3.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_3_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 100;
-var sourceHeight = 100;
-var smoothingEnabled = true;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-// 4 arguments, the source origin is not 0,0, the dest size is provided
-// The source canvas will copied to the 50, 50 position of the destination canvas and
-// on an area of 50x50 pixels
-destCtx.drawImage(sourceImg, 50, 50, 50, 50);
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_3_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_3_ref.html
deleted file mode 100644
index b72687a8ace..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_3_ref.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-color: red;
-    background-image: url("../2x2.png");
-    background-position: 50px 50px;
-    background-repeat: no-repeat;
-    background-size: 50px 50px;
-  }
-</style>
-<body>
-<div id="destination"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_4.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_4.html
deleted file mode 100644
index dfaf4018d69..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_4.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_4_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 100;
-var sourceHeight = 100;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-// 4 arguments, the dest origin is not 0,0 and the dest size is provided but
-// does not match the size of the source. The image will be distorted
-// The source canvas will copied to the 50,50 position of the destination canvas
-// and it will be shrunk to a and area of 16x16
-destCtx.drawImage(sourceImg, 50, 50, 16, 16);
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_4_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_4_ref.html
deleted file mode 100644
index baa6591a220..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_4_ref.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-color: red;
-  }
-
-  #destination img{
-    position: absolute;
-    top: 50px;
-    left: 50px;
-    width: 16px;
-    height: 16px;
-  }
-</style>
-<body>
-<div id="destination">
-  <img src="../2x2.png" />
-</div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_5.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_5.html
deleted file mode 100644
index a359fdf35b5..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_5.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_5_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 100;
-var sourceHeight = 100;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-// The source canvas will copied to the 50,50 position of the destination canvas
-// over an area of 64x32 pixels
-// The copied image will be distorted along the x axis
-destCtx.drawImage(sourceImg, 50, 50, 64, 32);
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_5_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_5_ref.html
deleted file mode 100644
index d8ec95525de..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_5_ref.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-color: red;
-    overflow: hidden;
-  }
-
-  #destination .img{
-    position: relative;
-    top: 50px;
-    left: 50px;
-    width: 64px;
-    height: 32px;
-  }
-
-  #destination .img img{
-    width: 100%;
-    height: 100%;
-  }
-
-</style>
-<body>
-<div id="destination">
-  <div class="img">
-    <img src="../2x2.png" />
-  </div>
-</div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_6.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_6.html
deleted file mode 100644
index 4482ca3c319..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_6.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_6_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 100;
-var sourceHeight = 100;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-
-// 8 arguments, both destination and source origins are 0, 0
-// An area of 32x32 pixels of the source image will be copied to
-// an area of 32x32 pixels of the destination canvas
-destCtx.drawImage(sourceImg, 0, 0, 32, 32, 0, 0, 32, 32);
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_6_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_6_ref.html
deleted file mode 100644
index d7343375508..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_6_ref.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-color: red;
-    background-color: red;
-    background-image: url("../2x2.png");
-    background-position: -32px -32px;
-    background-size: 64px 64px;
-    background-repeat: no-repeat;
-  }
-
-</style>
-<body>
-<div id="destination"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_7.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_7.html
deleted file mode 100644
index cf6daa0d4c3..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_7.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_7_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 100;
-var sourceHeight = 100;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-
-// 8 arguments the destination origin is not 0,0
-// An area of 32x32 pixels of the source image will be copied to
-// an area of 32x32 pixels of the destination canvas in the position 32,32
-destCtx.drawImage(sourceImg, 0, 0, 32, 32, 32, 32, 32, 32);
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_7_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_7_ref.html
deleted file mode 100644
index e823ffbb75a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_7_ref.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-color: red;
-  }
-
-  #img {
-    position: relative;
-    top: 32px;
-    left: 32px;
-    width: 32px;
-    height: 32px;
-    background-image: url("../2x2.png");
-    background-position: -32px -32px;
-    background-size: 64px 64px;
-    background-repeat: no-repeat;
-  }
-
-</style>
-<body>
-<div id="destination">
-  <div id="img"><div>
-</div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_8.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_8.html
deleted file mode 100644
index c1ebfa81648..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_8.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_8_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 100;
-var sourceHeight = 100;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-
-// The source rectangle overflows the source image
-// The source area is clipped to fit the source image
-// and the destination are is clipped in the same proportion
-destCtx.drawImage(sourceImg, 32, 32, 32, 32, 0, 0, 32, 32);
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_8_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_8_ref.html
deleted file mode 100644
index 1a025d26d99..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_8_ref.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-color: red;
-  }
-
-  #img {
-    position: relative;
-    top: 0px;
-    left: 0px;
-    width: 32px;
-    height: 32px;
-    background-image: url("../2x2.png");
-    background-position: -32px -32px;
-    background-size: 64px 64px;
-    background-repeat: no-repeat;
-  }
-
-</style>
-<body>
-<div id="destination">
-  <div id="img"><div>
-</div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_9.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_9.html
deleted file mode 100644
index f0fc85d384a..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_9.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<link rel=match href=drawimage_html_image_9_ref.html>
-<style>
-  html, body {
-    margin: 0;
-  }
-</style>
-<canvas id="dest" height="100" width="100"></canvas>
-<script>
-
-var sourceWidth = 100;
-var sourceHeight = 100;
-var smoothingEnabled = false;
-var destCanvas = document.getElementById('dest');
-var sourceImg = document.createElement('img');
-sourceImg.src = '../2x2.png'
-sourceImg.width = sourceWidth;
-sourceImg.height = sourceHeight;
-
-var destCtx = destCanvas.getContext('2d');
-destCtx.fillStyle = "#FF0000";
-destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-destCtx.imageSmoothingEnabled = smoothingEnabled;
-
-// The destination rectangle has negative width and height
-// An exception is raised and nothing is drawn
-try {
-    destCtx.drawImage(sourceImg, 25, 50, 50, 0, 0, -100, -100);
-    // It makes the test fail if the exception is not thrown
-    destCtx.fillStyle = "#0000FF";
-    destCtx.fillRect(0, 0,  destCanvas.width, destCanvas.height);
-}
-catch(err) {
-  console.err("Exception Thrown");
-}
-
-</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_9_ref.html b/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_9_ref.html
deleted file mode 100644
index 5341e05c1e1..00000000000
--- a/tests/wpt/mozilla/tests/mozilla/canvas/drawimage_html_image_9_ref.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
-<style>
-  html, body {
-    margin: 0;
-  }
-  #destination {
-    width: 100px;
-    height: 100px;
-    background-color: red;
-  }
-</style>
-<body>
-<div id="destination"></div>
-</body>
-</html>
diff --git a/tests/wpt/mozilla/tests/mozilla/canvas/fill_and_stroke_getters_setters.html b/tests/wpt/mozilla/tests/mozilla/canvas/fill_and_stroke_getters_setters.html
index 7ddaa5bfbf0..aec8c864348 100644
--- a/tests/wpt/mozilla/tests/mozilla/canvas/fill_and_stroke_getters_setters.html
+++ b/tests/wpt/mozilla/tests/mozilla/canvas/fill_and_stroke_getters_setters.html
@@ -16,12 +16,16 @@ function roundtrip(property, vals) {
   }
 }
 
-var img = document.createElement('img');
-img.src = '../2x2.png';
-var pattern = ctx.createPattern(img, 'repeat');
+async_test(function(t) {
+  var img = document.createElement('img');
+  img.src = '../2x2.png';
+  img.onload = t.step_func_done(function() {
+    var pattern = ctx.createPattern(img, 'repeat');
 
-var gradient = ctx.createLinearGradient(0.0, 0.0, 1.0, 1.0);
+    var gradient = ctx.createLinearGradient(0.0, 0.0, 1.0, 1.0);
 
-roundtrip('strokeStyle', ['#ff0000', gradient, pattern]);
-roundtrip('fillStyle', ['#ff0000', gradient, pattern]);
+    roundtrip('strokeStyle', ['#ff0000', gradient, pattern]);
+    roundtrip('fillStyle', ['#ff0000', gradient, pattern]);
+  });
+});
 </script>
diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html
index b9de85a9774..95b25b5adca 100644
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel=match href=drawimage_html_image_1_ref.html>
 <style>
@@ -26,5 +27,6 @@ sourceImg.onload = function() {
   // 2 arguments, the dest origin is 0,0
   // The source canvas will copied to the 0,0 position of the destination canvas
   destCtx.drawImage(sourceImg, 0, 0);
+  document.documentElement.classList.remove('reftest-wait');
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html
index 3b11b730fba..1579316a794 100644
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel=match href=drawimage_html_image_10_ref.html>
 <style>
@@ -30,5 +31,6 @@ sourceImg.onload = function() {
   // as if the destination was an infinite canvas
   // whose rendering was clipped to the dimensions of the scratch bitmap.
   destCtx.drawImage(sourceImg, 0, 0, 512, 512, 0, 0, 256, 256);
+  document.documentElement.classList.remove('reftest-wait');
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html
index dd1a6149bb0..692c3d33750 100644
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel=match href=drawimage_html_image_11_ref.html>
 <style>
@@ -28,5 +29,6 @@ sourceImg.onload = function() {
   // The source area is clipped to fit the source image
   // and the destination are is clipped in the same proportion
   destCtx.drawImage(sourceImg, 0, 0, 2048, 2048, 0, 0, 800, 800);
+  document.documentElement.classList.remove('reftest-wait');
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html
index 402a661f9f7..e918b067214 100644
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel=match href=drawimage_html_image_12_ref.html>
 <style>
@@ -28,5 +29,6 @@ sourceImg.onload = function() {
   // The source area is clipped to fit the source image
   // and the destination area is clipped in the same proportion
   destCtx.drawImage(sourceImg, -25, -25, 50, 50, 0, 0, 50, 50);
+  document.documentElement.classList.remove('reftest-wait');
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html
index e20ea97e2a8..ab0db08eb80 100644
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel=match href=drawimage_html_image_2_ref.html>
 <style>
@@ -27,5 +28,6 @@ sourceImg.onload = function() {
   // 2 arguments, the dest origin is not 0,0
   // The source image will copied to the 25, 25 position of the destination canvas
   destCtx.drawImage(sourceImg, 25, 25);
+  document.documentElement.classList.remove('reftest-wait');
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html
index e09c2ab0015..9ba2c865bfe 100644
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel=match href=drawimage_html_image_3_ref.html>
 <style>
@@ -27,5 +28,6 @@ sourceImg.onload = function() {
   // The source canvas will copied to the 50, 50 position of the destination canvas and
   // on an area of 50x50 pixels
   destCtx.drawImage(sourceImg, 50, 50, 50, 50);
+  document.documentElement.classList.remove('reftest-wait');
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html
index 7f029ab0a28..c05ac9703f8 100644
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel=match href=drawimage_html_image_4_ref.html>
 <style>
@@ -28,5 +29,6 @@ sourceImg.onload = function() {
   // The source canvas will copied to the 50,50 position of the destination canvas
   // and it will be shrunk to a and area of 16x16
   destCtx.drawImage(sourceImg, 50, 50, 16, 16);
+  document.documentElement.classList.remove('reftest-wait');
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html
index d221176adcb..23763f7b58c 100644
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel=match href=drawimage_html_image_5_ref.html>
 <style>
@@ -27,5 +28,6 @@ sourceImg.onload = function() {
   // over an area of 64x32 pixels
   // The copied image will be distorted along the x axis
   destCtx.drawImage(sourceImg, 50, 50, 64, 32);
+  document.documentElement.classList.remove('reftest-wait');
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html
index a32162a4640..4eee0d4a5df 100644
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel=match href=drawimage_html_image_6_ref.html>
 <style>
@@ -28,5 +29,6 @@ sourceImg.onload = function() {
   // An area of 32x32 pixels of the source image will be copied to
   // an area of 32x32 pixels of the destination canvas
   destCtx.drawImage(sourceImg, 0, 0, 32, 32, 0, 0, 32, 32);
+  document.documentElement.classList.remove('reftest-wait');
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html
index b902df0c24d..04e8398824c 100644
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel=match href=drawimage_html_image_7_ref.html>
 <style>
@@ -28,5 +29,6 @@ sourceImg.onload = function() {
   // An area of 32x32 pixels of the source image will be copied to
   // an area of 32x32 pixels of the destination canvas in the position 32,32
   destCtx.drawImage(sourceImg, 0, 0, 32, 32, 32, 32, 32, 32);
+  document.documentElement.classList.remove('reftest-wait');
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html
index 9b2301e2993..52e2d6ca34d 100644
--- a/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<html class="reftest-wait">
 <meta charset="utf-8">
 <link rel=match href=drawimage_html_image_8_ref.html>
 <style>
@@ -28,5 +29,6 @@ sourceImg.onload = function() {
   // The source area is clipped to fit the source image
   // and the destination are is clipped in the same proportion
   destCtx.drawImage(sourceImg, 32, 32, 32, 32, 0, 0, 32, 32);
+  document.documentElement.classList.remove('reftest-wait');
 }
 </script>