diff --git a/bin/circle-dependencies-post b/bin/circle-dependencies-post
index eded9ed8..945a9dd7 100755
--- a/bin/circle-dependencies-post
+++ b/bin/circle-dependencies-post
@@ -2,6 +2,8 @@
 
 set -e
 
+source "$STATE"
+
 sudo apt-get -q update && sudo apt-get -q install bc jq
 bin/setup-circleci-secrets "$SECRET_PASSWORD"
 mkdir -p $(dirname $SRCDIR) && cp -r $(pwd)/ $SRCDIR
diff --git a/bin/circle-deploy-issues b/bin/circle-deploy-issues
index 018d8925..ce3788a5 100755
--- a/bin/circle-deploy-issues
+++ b/bin/circle-deploy-issues
@@ -2,6 +2,8 @@
 
 set -e
 
+source "$STATE"
+
 go get github.com/weaveworks/wordepress
 cd /home/ubuntu/src/github.com/weaveworks/wordepress
 git checkout v1.0.0
diff --git a/bin/circle-deploy-master b/bin/circle-deploy-master
index 403cd72e..44ad699f 100755
--- a/bin/circle-deploy-master
+++ b/bin/circle-deploy-master
@@ -2,6 +2,8 @@
 
 set -e
 
+source "$STATE"
+
 docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
 cd $SRCDIR
 make clean-bin
diff --git a/bin/circle-deploy-release b/bin/circle-deploy-release
index fed3d35e..ce2e9eb5 100755
--- a/bin/circle-deploy-release
+++ b/bin/circle-deploy-release
@@ -2,6 +2,8 @@
 
 set -e
 
+source "$STATE"
+
 go get github.com/weaveworks/wordepress
 cd /home/ubuntu/src/github.com/weaveworks/wordepress
 git checkout v1.0.0
diff --git a/bin/circle-teardown-pre b/bin/circle-teardown-pre
index d4ac8e3c..f5d7a529 100755
--- a/bin/circle-teardown-pre
+++ b/bin/circle-teardown-pre
@@ -2,6 +2,8 @@
 
 set -e
 
+source "$STATE"
+
 if [ "$CIRCLE_NODE_INDEX" = "0" ] ; then
     go get github.com/mattn/goveralls
     goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/test/profile.cov -service=circleci
diff --git a/bin/circle-test-override b/bin/circle-test-override
index e8910b82..4d25df4e 100755
--- a/bin/circle-test-override
+++ b/bin/circle-test-override
@@ -2,6 +2,8 @@
 
 set -e
 
+source "$STATE"
+
 cd $SRCDIR/test
 eval $(./gce.sh hosts)
 export COVERAGE=true
diff --git a/bin/circle-test-post b/bin/circle-test-post
index 5d362b59..38e14faf 100755
--- a/bin/circle-test-post
+++ b/bin/circle-test-post
@@ -2,6 +2,8 @@
 
 set -e
 
+source "$STATE"
+
 cd $SRCDIR/test
 ./gce.sh destroy
 test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR/test; ./gen_coverage_reports.sh)
diff --git a/bin/circle-test-pre b/bin/circle-test-pre
index 2521d975..3256fbdf 100755
--- a/bin/circle-test-pre
+++ b/bin/circle-test-pre
@@ -2,6 +2,8 @@
 
 set -e
 
+source "$STATE"
+
 cd $SRCDIR
 make lint
 COVERDIR=test/coverage make RM= tests
diff --git a/circle.yml b/circle.yml
index 0f700619..2d8d9a34 100644
--- a/circle.yml
+++ b/circle.yml
@@ -12,6 +12,7 @@ machine:
     SRCDIR: /home/ubuntu/src/github.com/weaveworks/weave
     PATH: $PATH:$HOME/.local/bin
     CLOUDSDK_CORE_DISABLE_PROMPTS: 1
+    STATE: /home/ubuntu/state.env
 
 dependencies:
   cache_directories: