diff --git a/browser/base/content/test/general/browser_audioTabIcon.js b/browser/base/content/test/general/browser_audioTabIcon.js
index 707e5a5b3c2..d3f2b4492b0 100644
--- a/browser/base/content/test/general/browser_audioTabIcon.js
+++ b/browser/base/content/test/general/browser_audioTabIcon.js
@@ -192,7 +192,7 @@ function* test_swapped_browser(oldTab, newBrowser, isPlaying) {
   });
   let AudioPlaybackPromise = new Promise(resolve => {
     let observer = (subject, topic, data) => {
-      ok(true, "Should see an audio-playback notification");
+      ok(false, "Should not see an audio-playback notification");
     };
     Services.obs.addObserver(observer, "audio-playback", false);
     setTimeout(() => {
@@ -207,7 +207,7 @@ function* test_swapped_browser(oldTab, newBrowser, isPlaying) {
   ok(newTab.hasAttribute("muted"), "Expected the correct muted attribute on the new tab");
   is(newTab.hasAttribute("soundplaying"), isPlaying, "Expected the correct soundplaying attribute on the new tab");
 
-  // Wait to see if an audio-playback event is dispatched.
+  // Wait to see if an audio-playback event is dispatched.  This should not happen!
   yield AudioPlaybackPromise;
 
   ok(newTab.hasAttribute("muted"), "Expected the correct muted attribute on the new tab");
diff --git a/dom/canvas/test/reftest/reftest.list b/dom/canvas/test/reftest/reftest.list
index c28776872a2..b573c7f9474 100644
--- a/dom/canvas/test/reftest/reftest.list
+++ b/dom/canvas/test/reftest/reftest.list
@@ -1,6 +1,5 @@
 # WebGL Reftests!
 default-preferences pref(webgl.force-enabled,true)
-default-preferences pref(dom.audiochannel.mutedByDefault,false)
 
 # Check that disabling works:
                            == webgl-disable-test.html?nogl wrapper.html?green.png
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
index 5e1fb1771e1..6c95dc52e1e 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -4748,12 +4748,6 @@ HTMLMediaElement::IsPlayingThroughTheAudioChannel() const
     return false;
   }
 
-  // We should consider any bfcached page or inactive document/channel as
-  // non-playing.
-  if (mPausedForInactiveDocumentOrChannel) {
-    return false;
-  }
-
   // A loop always is playing
   if (HasAttr(kNameSpaceID_None, nsGkAtoms::loop)) {
     return true;
diff --git a/dom/media/test/crashtests/crashtests.list b/dom/media/test/crashtests/crashtests.list
index 9464ee5dcdd..3076c690fb8 100644
--- a/dom/media/test/crashtests/crashtests.list
+++ b/dom/media/test/crashtests/crashtests.list
@@ -7,7 +7,7 @@ load 474744-1.html
 HTTP load 481136-1.html # needs to be HTTP to recognize the ogg as an audio file?
 load 493915-1.html
 load 492286-1.xhtml
-skip-if(B2G) load 495794-1.html # in b2g all the media are muted by default
+load 495794-1.html
 load 576612-1.html
 load 752784-1.html
 load 789075-1.html