diff --git a/templates/common/Gruntfile.js b/templates/common/Gruntfile.js
index eb95172f0..1356336da 100644
--- a/templates/common/Gruntfile.js
+++ b/templates/common/Gruntfile.js
@@ -548,7 +548,7 @@ module.exports = function (grunt) {
       ]);
     }
 
-    if (target === 'client') {
+    else if (target === 'client') {
       return grunt.task.run([
         'clean:server',
         'concurrent:test',
@@ -557,13 +557,9 @@ module.exports = function (grunt) {
       ]);
     }
 
-    grunt.task.run([
-      'env:test',
-      'mochaTest',
-      'clean:server',
-      'concurrent:test',
-      'autoprefixer',
-      'karma'
+    else grunt.task.run([
+      'test:server',
+      'test:client'
     ]);
   });