diff --git a/build/run-testsapp.grunt.js b/build/run-testsapp.grunt.js
index ac5c0419c..588b9e648 100644
--- a/build/run-testsapp.grunt.js
+++ b/build/run-testsapp.grunt.js
@@ -279,12 +279,12 @@ module.exports = {
             "clean:simulatorLog"
         ]);
 
-        grunt.registerTask("buildTestsApp", [
-            "clean:workingDir",
-            "mkdir:workingDir",
+        grunt.registerTask("cleanup", [
             getPlatformSpecificTask("exec:kill{platform}Emulator"),
-            getPlatformSpecificTask("startEmulator{platform}"),
+            "clean:workingDir"
+        ]);
 
+        grunt.registerTask("buildOnly", [
             "exec:createApp",
             "clean:originalAppDir",
             "copy:testsAppToRunDir",
@@ -298,6 +298,13 @@ module.exports = {
             "shell:buildApp",
         ]);
 
+        grunt.registerTask("buildTestsApp", [
+            "cleanup",
+            "mkdir:workingDir",
+            "buildOnly"
+
+        ]);
+
         grunt.registerTask("runApp", [
             getPlatformSpecificTask("doPreUninstallApp{platform}"),
 
@@ -308,15 +315,14 @@ module.exports = {
 
         ]);
 
-        grunt.registerTask("cleanup", [
-            getPlatformSpecificTask("exec:kill{platform}Emulator"),
-            "clean:workingDir"
-        ]);
 
         var tasksToExecute = ["runApp"];
         if (!localCfg.runAppOnly) {
             tasksToExecute = [
-                "buildTestsApp",
+                "cleanup",
+                "mkdir:workingDir",
+                getPlatformSpecificTask("startEmulator{platform}"),
+                "buildOnly",
                 "runApp",
                 "cleanup"
             ];
diff --git a/gruntfile.js b/gruntfile.js
index e1913143a..c19a9987f 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -1,6 +1,6 @@
 module.exports = function(grunt) {
 
-    if (grunt.cli.tasks.indexOf("testsapp") >= 0 || grunt.cli.tasks.indexOf("buildtestsapp")>= 0) {
+    if (grunt.cli.tasks.indexOf("testsapp") >= 0 || grunt.cli.tasks.indexOf("buildTestsApp")>= 0) {
         var tsTester = require("./build/run-testsapp.grunt.js");
         tsTester.run(grunt);
     } else {
diff --git a/run.sh b/run.sh
index 373687fa8..9036d9b96 100755
--- a/run.sh
+++ b/run.sh
@@ -11,4 +11,4 @@ androidRuntimePath=realpath ../../../LATEST_RUNTIMES/tns-android.tgz
 #grunt testsapp --verbose --platform=iOS --runAppOnly --logFilePath="./TestRunResult.txt" --runtimePath="/Users/erjan/tns-ios.tgz" --showEmu=true --modulesPath=/Volumes/distributions/DailyBuilds/NativeScript/tns-modules/Stable/tns-core-modules.tgz --avd="'iPhone 6 (9.0) ['"
 
 
-grunt testsapp --verbose --platform=Android --emuPId=".*emulator64-x86" --avd="Api21" --logFilePath="./TestRunResult.txt" --runtimePath=$androidRuntimePath --showEmu=true #--modulesPath=/Volumes/distributions/DailyBuilds/NativeScript/tns-modules/Stable/tns-core-modules.tgz
+grunt buildTestsApp --verbose --platform=Android --emuPId=".*emulator64-x86" --avd="Api21" --logFilePath="./TestRunResult.txt" --runtimePath=$androidRuntimePath --showEmu=true #--modulesPath=/Volumes/distributions/DailyBuilds/NativeScript/tns-modules/Stable/tns-core-modules.tgz