diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 08b2dba5acd..2f85fde17f5 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -569373,11 +569373,11 @@
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_order_canplay_playing.html": [
-   "31e4dbecfe979d8d9435f2a69938fa8887ff981e",
+   "7d2254f2362cc90fd7f7573d5c7b7a9bfd29187e",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html": [
-   "1f9a9ee27d7cedb3c7f128276770334780afb523",
+   "47080891dfd6b2f011fdbb6423e2635ac84eecc4",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/event_order_loadstart_progress.html": [
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini
index ef23353c3bc..767a2a5bf71 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html.ini
@@ -1,6 +1,5 @@
 [event_order_loadedmetadata_loadeddata.html]
   type: testharness
-  expected: TIMEOUT
   [setting src attribute on autoplay audio should trigger loadedmetadata then loadeddata event]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html
index 3aba3684f19..4c0054c241d 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/event_order_loadedmetadata_loadeddata.html
@@ -18,16 +18,15 @@ test(function() {
   var t = async_test("setting src attribute on autoplay audio should trigger loadedmetadata then loadeddata event", {timeout:5000});
   var a = document.getElementById("a");
   var found_loadedmetadata = false;
-  a.addEventListener("loadedmetadata", function() {
+  a.addEventListener("error", t.unreached_func());
+  a.addEventListener("loadedmetadata", t.step_func(function() {
     found_loadedmetadata = true;
-  });
-  a.addEventListener("loadeddata", function() {
-    t.step(function() {
-     assert_true(found_loadedmetadata);
-    });
+  }));
+  a.addEventListener("loadeddata", t.step_func(function() {
+    assert_true(found_loadedmetadata);
     t.done();
     a.pause();
-  }, false);
+  }), false);
   a.src = getAudioURI("/media/sound_5") + "?" + new Date() + Math.random();
 }, "audio events - loadedmetadata, then loadeddata");
 
@@ -35,16 +34,15 @@ test(function() {
   var t = async_test("setting src attribute on autoplay video should trigger loadedmetadata then loadeddata event", {timeout:5000});
   var v = document.getElementById("v");
   var found_loadedmetadata = false;
-  v.addEventListener("loadedmetadata", function() {
+  v.addEventListener("error", t.unreached_func());
+  v.addEventListener("loadedmetadata", t.step_func(function() {
     found_loadedmetadata = true;
-  });
-  v.addEventListener("loadeddata", function() {
-    t.step(function() {
-     assert_true(found_loadedmetadata);
-    });
+  }));
+  v.addEventListener("loadeddata", t.step_func(function() {
+    assert_true(found_loadedmetadata);
     t.done();
     v.pause();
-  }, false);
+  }), false);
   v.src = getVideoURI("/media/movie_5") + "?" + new Date() + Math.random();
 }, "video events - loadedmetadata, then loadeddata");
  </script>