diff --git a/lib/meteor.js b/lib/meteor.js
index 597ff3c80f..7c36de02e5 100644
--- a/lib/meteor.js
+++ b/lib/meteor.js
@@ -554,7 +554,7 @@ Fiber(function () {
         if (new_argv.settings)
           settings = runner.getSettings(new_argv.settings);
         // accept packages iff we're deploying tests
-        var project_dir = path.resolve(require_project("bundle"));
+        var project_dir = path.resolve(require_project("deploy"));
         deploy.deploy_app(new_argv._[1], project_dir, new_argv.debug,
                           new_argv.tests, new_argv.password, settings);
       }
diff --git a/tools/cli-test.sh b/tools/cli-test.sh
index c76f446b09..28e1472c79 100755
--- a/tools/cli-test.sh
+++ b/tools/cli-test.sh
@@ -42,15 +42,15 @@ $METEOR reset --help | grep "Reset the current" > /dev/null
 
 echo "... not in dir"
 
-$METEOR | grep "You're not in" > /dev/null
-$METEOR run | grep "You're not in" > /dev/null
-$METEOR add foo | grep "You're not in" > /dev/null
-$METEOR remove foo | grep "You're not in" > /dev/null
-$METEOR list --using | grep "You're not in" > /dev/null
-$METEOR bundle foo.tar.gz | grep "You're not in" > /dev/null
-$METEOR mongo | grep "You're not in" > /dev/null
-$METEOR deploy automated-test | grep "You're not in" > /dev/null
-$METEOR reset | grep "You're not in" > /dev/null
+$METEOR | grep "run: You're not in" > /dev/null
+$METEOR run | grep "run: You're not in" > /dev/null
+$METEOR add foo | grep "add: You're not in" > /dev/null
+$METEOR remove foo | grep "remove: You're not in" > /dev/null
+$METEOR list --using | grep "list --using: You're not in" > /dev/null
+$METEOR bundle foo.tar.gz | grep "bundle: You're not in" > /dev/null
+$METEOR mongo | grep "mongo: You're not in" > /dev/null
+$METEOR deploy automated-test | grep "deploy: You're not in" > /dev/null
+$METEOR reset | grep "reset: You're not in" > /dev/null
 
 echo "... create"