diff --git a/bin/circle-dependencies-post b/bin/circle-dependencies-post
index 8f26bb0f..e086550a 100755
--- a/bin/circle-dependencies-post
+++ b/bin/circle-dependencies-post
@@ -40,4 +40,7 @@ if [ -n "$TEST_AND_PUBLISH" ] ; then
     ../tools/rebuild-image weaveworks/weavebuild . Dockerfile build.sh
     touch $SRCDIR/.build.uptodate
     sudo chown -R ubuntu /usr/local/go
+    cd $SRCDIR
+    make testrunner
+    make COVERAGE=true RM= exes all
 fi
diff --git a/bin/circle-test-pre b/bin/circle-test-pre
index b3fa1446..16a0c0ff 100755
--- a/bin/circle-test-pre
+++ b/bin/circle-test-pre
@@ -5,10 +5,6 @@ set -e
 source "$STATE"
 
 if [ -n "$TEST_AND_PUBLISH" ] ; then
-    cd $SRCDIR
-    make testrunner
-    make COVERAGE=true RM= all
-
     cd $SRCDIR/test
     [ -z "$SECRET_PASSWORD" ] || (./gce.sh setup && eval $(./gce.sh hosts) && ./setup.sh)
 fi