diff --git a/dom/media/test/test_empty_resource.html b/dom/media/test/test_empty_resource.html
index 987fa2f75d25..e8d9beeea9e9 100644
--- a/dom/media/test/test_empty_resource.html
+++ b/dom/media/test/test_empty_resource.html
@@ -29,8 +29,8 @@ function finish(v) {
 
 function onload() {
   info("iframe loaded");
-  var v = document.body.getElementsByTagName("iframe")[0]
-                  .contentDocument.body.getElementsByTagName("video")[0];
+  var v = SpecialPowers.wrap(document.body.getElementsByTagName("iframe")[0])
+                       .contentDocument.body.getElementsByTagName("video")[0];
 
   // Got 'error' as expected, finish the test.
   if (v.error) {
diff --git a/dom/media/webaudio/test/file_nodeCreationDocumentGone.html b/dom/media/webaudio/test/file_nodeCreationDocumentGone.html
new file mode 100644
index 000000000000..aedf16702f16
--- /dev/null
+++ b/dom/media/webaudio/test/file_nodeCreationDocumentGone.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<html><script>
+var context = new AudioContext();
+setTimeout(function(){window.close();},1000);</script></html>
diff --git a/dom/media/webaudio/test/mochitest.ini b/dom/media/webaudio/test/mochitest.ini
index 56a07ed0801a..2344362a7ef0 100644
--- a/dom/media/webaudio/test/mochitest.ini
+++ b/dom/media/webaudio/test/mochitest.ini
@@ -11,6 +11,7 @@ support-files =
   audiovideo.mp4
   audioBufferSourceNodeDetached_worker.js
   corsServer.sjs
+  file_nodeCreationDocumentGone.html
   invalid.txt
   layouttest-glue.js
   noaudio.webm
diff --git a/dom/media/webaudio/test/test_nodeCreationDocumentGone.html b/dom/media/webaudio/test/test_nodeCreationDocumentGone.html
index ae1d1f3b2acb..2252d57a78a2 100644
--- a/dom/media/webaudio/test/test_nodeCreationDocumentGone.html
+++ b/dom/media/webaudio/test/test_nodeCreationDocumentGone.html
@@ -12,11 +12,7 @@
 SimpleTest.requestCompleteLog();
 SimpleTest.waitForExplicitFinish();
 
-var sub = encodeURI("data:text/html,<!DOCTYPE html>\n"+
-                    "<html><script>"+
-                    "var context = new AudioContext();"+
-                    "setTimeout(function(){window.close();},1000);\x3C/script></html>");
-var a = window.open(sub);
+var a = window.open("file_nodeCreationDocumentGone.html");
 a.onbeforeunload = function() {
   setTimeout(function(){
     try {
diff --git a/dom/media/webspeech/synth/test/common.js b/dom/media/webspeech/synth/test/common.js
index 0ce9ec51b7a9..a74d59d52a86 100644
--- a/dom/media/webspeech/synth/test/common.js
+++ b/dom/media/webspeech/synth/test/common.js
@@ -58,7 +58,7 @@ function loadFrame(frameId) {
       frame.contentWindow.document.title = frameId;
       resolve(frame);
     });
-    frame.src = 'data:text/html,' + encodeURI('<html><head></head><body></body></html>');
+    frame.src = 'about:blank';
   });
 }
 
@@ -88,4 +88,4 @@ function testSynthState(win, expectedState) {
     is(win.speechSynthesis[attr], expectedState[attr],
       win.document.title + ": '" + attr + '" does not match');
   }
-}
\ No newline at end of file
+}
diff --git a/dom/media/webspeech/synth/test/file_bfcache_frame.html b/dom/media/webspeech/synth/test/file_bfcache_frame.html
index c8663b7fb0b1..d352260fa615 100644
--- a/dom/media/webspeech/synth/test/file_bfcache_frame.html
+++ b/dom/media/webspeech/synth/test/file_bfcache_frame.html
@@ -3,21 +3,11 @@
 <head>
   <meta charset="utf-8">
   <script type="application/javascript">
-    var frameUnloaded = function() {
-      var u = new SpeechSynthesisUtterance('hi');
-      u.addEventListener('end', function () {
-        parent.ok(true, 'Successfully spoke utterance from new frame.');
-        parent.onDone();
-      });
-      speechSynthesis.speak(u);
-    }
     addEventListener('pageshow', function onshow(evt) {
       var u = new SpeechSynthesisUtterance('hello');
       u.lang = 'it-IT-noend';
       u.addEventListener('start', function() {
-        location =
-          'data:text/html,<html><body onpageshow="' +
-          frameUnloaded.toSource() + '()"></body></html>';
+        location = "file_bfcache_frame2.html";
       });
       speechSynthesis.speak(u);
     });
diff --git a/dom/media/webspeech/synth/test/file_bfcache_frame2.html b/dom/media/webspeech/synth/test/file_bfcache_frame2.html
new file mode 100644
index 000000000000..7976c5eab904
--- /dev/null
+++ b/dom/media/webspeech/synth/test/file_bfcache_frame2.html
@@ -0,0 +1,14 @@
+<html>
+<script>
+var frameUnloaded = function() {
+  var u = new SpeechSynthesisUtterance('hi');
+  u.addEventListener('end', function () {
+    parent.ok(true, 'Successfully spoke utterance from new frame.');
+    parent.onDone();
+  });
+  speechSynthesis.speak(u);
+};
+</script>
+
+<body onpageshow="frameUnloaded()"></body></html>
+
diff --git a/dom/media/webspeech/synth/test/mochitest.ini b/dom/media/webspeech/synth/test/mochitest.ini
index f27cd4e1b22b..63ffb90ef4c1 100644
--- a/dom/media/webspeech/synth/test/mochitest.ini
+++ b/dom/media/webspeech/synth/test/mochitest.ini
@@ -4,6 +4,7 @@ subsuite = media
 support-files =
   common.js
   file_bfcache_frame.html
+  file_bfcache_frame2.html
   file_setup.html
   file_speech_queue.html
   file_speech_simple.html
