diff --git a/circle.yml b/circle.yml
index 180a517ef96afd120007866e26bd4b7b748cd243..ba5109360bc34fb2b4e91a9357a127de605ae4a4 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,7 +2,7 @@ machine:
   environment:
     GOPATH: $HOME/.go_workspace
     REPO: ${GOPATH}/src/github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}
-    DOCKER_VERSION: 1.10.0
+    DOCKER_VERSION: 1.9.1
     DOCKER_MACHINE_VERSION: 0.6.0
     GO15VENDOREXPERIMENT: 1
   post:
diff --git a/tests/build_tool.sh b/tests/build_tool.sh
index 8a155ec27524cccf6493502a5630d6259c7f612a..1d3c2a3ec9fd63085e2f524d8b3ebcf5ace38586 100755
--- a/tests/build_tool.sh
+++ b/tests/build_tool.sh
@@ -51,4 +51,9 @@ fi
 # Cleanup
 rm $REPO/target/docker/burrow.dockerartefact
 rm $REPO/target/docker/burrow-client.dockerartefact
-docker rmi -f $IMAGE:build
+
+# CircleCI seems to have an issues removing this build, in any case it is not necessary on CI
+if [ ! "$CI" ]
+then
+  docker rmi -f $IMAGE:build
+fi