diff --git a/Makefile b/Makefile
index e465c6bf..dcc319f4 100644
--- a/Makefile
+++ b/Makefile
@@ -371,6 +371,7 @@ TARGETS = \
 	test-spectron \
 	test-gui \
 	test-sdk \
+	test-cli \
 	test \
 	sanity-checks \
 	clean \
@@ -549,6 +550,11 @@ test-sdk:
 		tests/shared \
 		tests/image-stream
 
+test-cli:
+	mocha $(MOCHA_OPTIONS) \
+		tests/shared \
+		tests/image-stream
+
 test: test-gui test-sdk test-spectron
 
 help:
diff --git a/package.json b/package.json
index 3e22b5ea..6ca91c28 100644
--- a/package.json
+++ b/package.json
@@ -24,9 +24,9 @@
     "configure": "node-gyp configure",
     "build": "node-gyp build",
     "install": "node-gyp rebuild",
-    "concourse-dependencies": "make info && make electron-develop",
     "concourse-test": "npm test",
-    "concourse-build-installers": "make installers-all"
+    "concourse-test-electron": "npm test",
+    "concourse-test-node-cli": "make lint test-cli sanity-checks"
   },
   "author": "Resin Inc. <hello@etcher.io>",
   "license": "Apache-2.0",