2 files changed, 3 insertions, 3 deletions
diff --git a/test/runner.sh b/test/runner.sh
index 561110a8..6715f5f9 100755
--- a/test/runner.sh
+++ b/test/runner.sh
@@ -4,4 +4,4 @@ erlc runner.erl
 
 erl -noshell -pa ../src/couchdb -pa ../src/mochiweb -eval "runner:run()"
 
-cat ../share/www/script/couch.js ../share/www/script/couch_test_runner.js ../share/www/script/couch_tests.js test.js  | ../src/couchdb/couchjs -
+cat ../share/www/script/couch.js ../share/www/script/couch_test_runner.js ../share/www/script/couch_tests.js ../share/www/script/test/* test.js  | ../src/couchdb/couchjs -
diff --git a/test/test.js b/test/test.js
index a4aa32e1..f3990966 100644
--- a/test/test.js
+++ b/test/test.js
@@ -194,14 +194,14 @@ var numFailures = 0;
 function runAllTestsConsole() {
   var numTests = 0;
   var debug = false;
-  for (var t in tests) {
+  for (var t in couchTests) {
     p(t);
     if (t == "utf8") {
       p("We skip the utf8 test because it fails due to problems in couch_js.c");
       p("Run the in-browser tests to verify utf8.\n");
     } else {
       numTests += 1;
-      var testFun = tests[t];
+      var testFun = couchTests[t];
       runTestConsole(testFun, debug);      
     }
   }