diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 11de1d0af69..aa6a2d6a7ff 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569329,7 +569329,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_canplay.html": [
-   "e68b3bfc3a4fb897b1435fc1d7ba4596c2efbfbe",
+   "65d79aca07b4d6387b149896e98fb6996c48efa4",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_canplay_noautoplay.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay.html.ini
index 1c793999227..68c911f9d10 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_canplay.html.ini
@@ -1,6 +1,5 @@
 [event_canplay.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on autoplay audio should trigger canplay event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay.html
index 8e1b32dcb30..e79c5d1c76d 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_canplay.html
@@ -17,20 +17,22 @@
 test(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger canplay event", {timeout:5000});
   var a = document.getElementById("a");
-  a.addEventListener("canplay", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("canplay", t.step_func(function() {
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - canplay");
 
 test(function() {
   var t = async_test("setting src attribute on autoplay video should trigger canplay event", {timeout:5000});
   var v = document.getElementById("v");
-  v.addEventListener("canplay", function() {
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("canplay", t.step_func(function() {
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - canplay");
   </script>