diff --git a/test/call-load-test.js b/test/call-load-test.js
index 9de2ccd4..4e208971 100644
--- a/test/call-load-test.js
+++ b/test/call-load-test.js
@@ -1,5 +1,3 @@
-load("test/qunit.js");
-
 Envjs("test/index.html", {});
 
 test("'index.html' loaded correctly via 'Envjs()' call", function(){
@@ -13,5 +11,3 @@ test("window.location= following Envjs() initialization flagged as error",
      function(){
     expect(0);
 });
-
-Envjs.wait();
\ No newline at end of file
diff --git a/test/primary-tests.js b/test/primary-tests.js
index ace6cbcd..265b9b03 100644
--- a/test/primary-tests.js
+++ b/test/primary-tests.js
@@ -1,5 +1,3 @@
-load("test/qunit.js");
-
 window.addEventListener("load",function(){
   print("\n\nTesting with " + whichInterpreter);
   print("Handling onload for test.js");
@@ -26,5 +24,3 @@ window.addEventListener("load",function(){
 });
 
 window.location = "test/index.html";
-
-Envjs.wait();
\ No newline at end of file
diff --git a/test/prototype-test.js b/test/prototype-test.js
index c7c2b1f4..73903e40 100644
--- a/test/prototype-test.js
+++ b/test/prototype-test.js
@@ -1,5 +1,3 @@
-load("test/qunit.js");
-
 window.addEventListener("load",function(){
   print("\n\nTesting with " + whichInterpreter);
   print("Handling onload for test.js");
@@ -11,5 +9,3 @@ window.addEventListener("load",function(){
 });
 
 window.location = "test/index.html";
-
-Envjs.wait();
\ No newline at end of file
diff --git a/test/test.js b/test/test.js
index 1cbfa1fc..98de637b 100644
--- a/test/test.js
+++ b/test/test.js
@@ -5,4 +5,7 @@ multiwindow = !(whichJarFile == "rhino");
 whichInterpreter = whichJarFile + " interpreter jar";
 
 load("dist/env.rhino.js");
+load("test/qunit.js");
 load("test/" + whichTestFile + ".js");
+
+Envjs.wait();