diff --git a/lib/autospec/run-qunit.js b/lib/autospec/run-qunit.js
index 2200aac6236..a4a851822e1 100644
--- a/lib/autospec/run-qunit.js
+++ b/lib/autospec/run-qunit.js
@@ -1,11 +1,15 @@
 /*jshint devel:true, phantom:true */
-/*global QUnit, ANSI */
+/*globals QUnit ANSI */
+
 // THIS FILE IS CALLED BY "qunit_runner.rb" IN AUTOSPEC
 
-var system = require('system'),
-    args = system.args;
+var system = require("system"),
+    args = phantom.args;
 
-args.shift();
+if (args === undefined) {
+  args = system.args;
+  args.shift();
+}
 
 if (args.length !== 1) {
   console.log("Usage: " + phantom.scriptName + " <URL>");
diff --git a/vendor/assets/javascripts/run-qunit.js b/vendor/assets/javascripts/run-qunit.js
index 2d707294865..f2bca495325 100644
--- a/vendor/assets/javascripts/run-qunit.js
+++ b/vendor/assets/javascripts/run-qunit.js
@@ -3,9 +3,12 @@
 /*globals QUnit phantom*/
 
 var system = require("system"),
-    args = system.args;
+    args = phantom.args;
 
-args.shift();
+if (args === undefined) {
+  args = system.args;
+  args.shift();
+}
 
 if (args.length < 1 || args.length > 2) {
   console.log("Usage: " + phantom.scriptName + " <URL> <timeout>");