diff --git a/bin/circle-test-pre b/bin/circle-test-pre
index e019c3b6..9c43e1c9 100755
--- a/bin/circle-test-pre
+++ b/bin/circle-test-pre
@@ -6,10 +6,8 @@ source "$STATE"
 
 if [ -z "$SKIP_TESTS" ] ; then
     cd $SRCDIR
-    make lint
-    COVERDIR=test/coverage make RM= tests
-    make COVERAGE=true RM= all
     make testrunner
+    make COVERAGE=true RM= all
 
     cd $SRCDIR/test
     ./gce.sh setup && eval $(./gce.sh hosts) && ./setup.sh
diff --git a/bin/circle-test-override b/bin/circle-test-smoke
similarity index 100%
rename from bin/circle-test-override
rename to bin/circle-test-smoke
diff --git a/bin/circle-test-post b/bin/circle-test-teardown
similarity index 100%
rename from bin/circle-test-post
rename to bin/circle-test-teardown
diff --git a/bin/circle-test-unit b/bin/circle-test-unit
new file mode 100755
index 00000000..93a51ec6
--- /dev/null
+++ b/bin/circle-test-unit
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+source "$STATE"
+
+if [ -z "$SKIP_TESTS" ] ; then
+    cd $SRCDIR
+    make lint
+    COVERDIR=test/coverage make RM= tests
+fi
diff --git a/circle.yml b/circle.yml
index 2d8d9a34..0870e542 100644
--- a/circle.yml
+++ b/circle.yml
@@ -25,11 +25,13 @@ test:
     - "$SRCDIR/bin/circle-test-pre":
         parallel: true
   override:
-    - "$SRCDIR/bin/circle-test-override":
+    - "$SRCDIR/bin/circle-test-unit":
+        parallel: true
+    - "$SRCDIR/bin/circle-test-smoke":
         parallel: true
         timeout: 300
   post:
-    - "$SRCDIR/bin/circle-test-post":
+    - "$SRCDIR/bin/circle-test-teardown":
         parallel: true
 
 teardown: