diff --git a/dom/media/test/manifest.js b/dom/media/test/manifest.js
index d2315327df7..a7b26f3184b 100644
--- a/dom/media/test/manifest.js
+++ b/dom/media/test/manifest.js
@@ -681,6 +681,7 @@ var gMetadataTests = [
   { name:"wave_metadata_bad_len.wav", tags: {
       name:"Track Title",
       artist:"Artist Name",
+      comments:"Comments",
     }
   },
   { name:"wave_metadata_bad_no_null.wav", tags: {
diff --git a/dom/media/test/test_decode_error.html b/dom/media/test/test_decode_error.html
index c7081a0db8b..10259483411 100644
--- a/dom/media/test/test_decode_error.html
+++ b/dom/media/test/test_decode_error.html
@@ -20,24 +20,19 @@ function startTest(test, token) {
     ok(el.error, "Element 'error' attr expected to have a value");
     ok(el.error instanceof MediaError, "Element 'error' attr expected to be MediaError");
     is(el.error.code, MediaError.MEDIA_ERR_DECODE, "Expected a decode error");
-    is(el.networkState, HTMLMediaElement.NETWORK_EMPTY, "networkState should be EMPTY");
     el._sawError = true;
-  }, false);
-
-  v.addEventListener("emptied", function (event) {
-    var el = event.currentTarget;
-    is(el.networkState, HTMLMediaElement.NETWORK_EMPTY, "networkState should be EMPTY");
-    ok(el._sawError, "Expected error event");
     manager.finished(token);
   }, false);
 
-  v.addEventListener("loadedmetadata", function () {
-    ok(false, "Unexpected loadedmetadata event");
+  v.addEventListener("loadeddata", function () {
+    ok(false, "Unexpected loadeddata event");
+    manager.finished(token);
   }, false);
 
   v.autoplay = true;
   v.addEventListener("ended", function () {
     ok(false, "Unexpected ended event");
+    manager.finished(token);
   }, false);
 
   v.src = test.name; // implicitly starts a load.
diff --git a/dom/media/webaudio/test/test_decodeMultichannel.html b/dom/media/webaudio/test/test_decodeMultichannel.html
index 1095234ef1e..0fb2f5b3c61 100644
--- a/dom/media/webaudio/test/test_decodeMultichannel.html
+++ b/dom/media/webaudio/test/test_decodeMultichannel.html
@@ -23,11 +23,11 @@ function finishTest(a) {
 function decodeUsingAudioElement() {
   var a = new Audio();
   a.addEventListener("error", function() {
-    ok(true, "We should not be able to decode this file using an HTMLAudioElement");
+    ok(false, "Error loading metadata");
     finishTest(a);
   });
   a.addEventListener("loadedmetadata", function() {
-    ok(false, "We should not be able to decode this file using an HTMLMediaElement.");
+    ok(true, "Metadata Loaded");
     finishTest(a);
   });