diff --git a/circle.yml b/circle.yml
index d20f703ba..54117b8e1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -32,8 +32,8 @@ dependencies:
 
 test:
   override:
-    - cd "${WORKDIR}" && make test-style
-    - cd "${WORKDIR}" && make test-unit
+    - cd "${WORKDIR}" && ./scripts/ci.sh:
+        parallel: true
 
 deployment:
   gcr:
@@ -41,5 +41,4 @@ deployment:
     commands:
       - echo $GCLOUD_SERVICE_KEY | base64 --decode > ${HOME}/gcloud-service-key.json
       - docker login -e 1234@5678.com -u _json_key -p "$(cat ${HOME}/gcloud-service-key.json)" https://gcr.io
-      - cd "${WORKDIR}" && make docker-build
       - docker push gcr.io/kubernetes-helm/tiller:canary
diff --git a/scripts/ci.sh b/scripts/ci.sh
new file mode 100755
index 000000000..80423a3ef
--- /dev/null
+++ b/scripts/ci.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+# Copyright 2016 The Kubernetes Authors All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Bash 'Strict Mode'
+# http://redsymbol.net/articles/unofficial-bash-strict-mode
+set -euo pipefail
+IFS=$'\n\t'
+
+HELM_ROOT="${BASH_SOURCE[0]%/*}/.."
+cd "$HELM_ROOT"
+
+case "${CIRCLE_NODE_INDEX-0}" in
+  0)
+    echo "Running 'make test-unit'"
+    make test-unit
+    ;;
+  1)
+    echo "Running 'make test-style'"
+    make test-style
+    ;;
+  2)
+    echo "Running 'make docker-build'"
+    make test-style
+    ;;
+esac