diff --git a/content/xbl/test/Makefile.in b/content/xbl/test/Makefile.in
index a0c67a78e65d..bdd598ef1aa8 100644
--- a/content/xbl/test/Makefile.in
+++ b/content/xbl/test/Makefile.in
@@ -16,9 +16,11 @@ MOCHITEST_FILES =	\
 		bug310107-resource.xhtml \
 		test_bug366770.html \
 		test_bug371724.xhtml \
-		test_bug372769.xhtml \
+		test_bug372769.html \
+		file_bug372769.xhtml \
 		test_bug378866.xhtml \
-		test_bug397934.xhtml \
+		test_bug397934.html \
+		file_bug397934.xhtml \
 		test_bug389322.xhtml \
 		test_bug400705.xhtml \
 		test_bug401907.xhtml \
diff --git a/content/xbl/test/test_bug372769.xhtml b/content/xbl/test/file_bug372769.xhtml
similarity index 95%
rename from content/xbl/test/test_bug372769.xhtml
rename to content/xbl/test/file_bug372769.xhtml
index dc754cd9bccb..79a36be854a7 100644
--- a/content/xbl/test/test_bug372769.xhtml
+++ b/content/xbl/test/file_bug372769.xhtml
@@ -4,8 +4,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=372769
 -->
 <head>
   <title>Test for Bug 372769</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <bindings xmlns="http://www.mozilla.org/xbl">
     <binding id="test1">
       <implementation>
@@ -84,8 +82,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=372769
 <![CDATA[
 
 /** Test for Bug 372769 **/
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(function() {
+
+SimpleTest = parent.SimpleTest;
+ok = parent.ok;
+is = parent.is;
+$ = function(x) { return document.getElementById(x); }
+
+window.onload = function() {
   var d = $("display1");
   is(d.one, 1, "Should be able to read field");
 
@@ -168,9 +171,8 @@ addLoadEvent(function() {
   }
   is(found, true, "Enumeration is broken");
   is(d["twenty-one"], 21, "Should be 21");
-  
-});
-addLoadEvent(SimpleTest.finish);
+  SimpleTest.finish();
+}
 ]]>
 </script>
 </pre>
diff --git a/content/xbl/test/test_bug397934.xhtml b/content/xbl/test/file_bug397934.xhtml
similarity index 93%
rename from content/xbl/test/test_bug397934.xhtml
rename to content/xbl/test/file_bug397934.xhtml
index 7c56409d1b01..c8505aab4788 100644
--- a/content/xbl/test/test_bug397934.xhtml
+++ b/content/xbl/test/file_bug397934.xhtml
@@ -4,8 +4,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=397934
 -->
 <head>
   <title>Test for Bug 397934</title>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <bindings xmlns="http://www.mozilla.org/xbl">
     <binding id="ancestor">
       <implementation>
@@ -59,8 +57,11 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=397934
 <![CDATA[
 
 /** Test for Bug 397934 **/
-SimpleTest.waitForExplicitFinish();
-addLoadEvent(function() {
+SimpleTest = parent.SimpleTest;
+ok = parent.ok;
+is = parent.is;
+$ = function(x) { return document.getElementById(x); }
+window.onload = function() {
   var d;
   d = $("display1");
   is(d.storage, window,
@@ -105,8 +106,8 @@ addLoadEvent(function() {
      "test2" + ": Undefined field should override ancestor binding");
   is(typeof(d.testAncestor), "undefined",
      "test2" + ": Undefined field should really override ancestor binding");
-});
-addLoadEvent(SimpleTest.finish);
+  SimpleTest.finish();
+}
 
 ]]>
 </script>
diff --git a/content/xbl/test/test_bug372769.html b/content/xbl/test/test_bug372769.html
new file mode 100644
index 000000000000..c5cbbb7dea3e
--- /dev/null
+++ b/content/xbl/test/test_bug372769.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=372769
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 372769</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+
+  SimpleTest.waitForExplicitFinish();
+
+  // Embed the real test. It will take care of everything else.
+  function setup() {
+    SpecialPowers.pushPrefEnv({'set': [['dom.use_xbl_scopes_for_remote_xul', false]]}, go);
+  }
+  function go() {
+    $('ifr').setAttribute('src', 'file_bug372769.xhtml');
+  }
+
+  </script>
+</head>
+<body onload="setup();">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=372769">Mozilla Bug 372769</a>
+<p id="display"></p>
+<div id="content">
+<iframe id="ifr"></iframe>
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>
diff --git a/content/xbl/test/test_bug397934.html b/content/xbl/test/test_bug397934.html
new file mode 100644
index 000000000000..098b4c7b54a2
--- /dev/null
+++ b/content/xbl/test/test_bug397934.html
@@ -0,0 +1,34 @@
+<!DOCTYPE HTML>
+<html>
+<!--
+https://bugzilla.mozilla.org/show_bug.cgi?id=397934
+-->
+<head>
+  <meta charset="utf-8">
+  <title>Test for Bug 397934</title>
+  <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
+  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+  <script type="application/javascript">
+
+  SimpleTest.waitForExplicitFinish();
+
+  // Embed the real test. It will take care of everything else.
+  function setup() {
+    SpecialPowers.pushPrefEnv({'set': [['dom.use_xbl_scopes_for_remote_xul', false]]}, go);
+  }
+  function go() {
+    $('ifr').setAttribute('src', 'file_bug397934.xhtml');
+  }
+
+  </script>
+</head>
+<body onload="setup();">
+<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=397934">Mozilla Bug 397934</a>
+<p id="display"></p>
+<div id="content">
+<iframe id="ifr"></iframe>
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>
