diff --git a/Makefile b/Makefile
index cd7b59f24b9..752218746d8 100644
--- a/Makefile
+++ b/Makefile
@@ -86,6 +86,7 @@ docker: aufs
 	apt-get install -qq -y curl
 	egrep -i "^docker" /etc/group || groupadd docker
 	usermod -aG docker dokku
+ifndef CI
 	curl -sSL https://get.docker.com/gpg | apt-key add -
 	echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/docker.list
 	apt-get update
@@ -95,6 +96,7 @@ else
 	apt-get install -qq -y lxc-docker
 endif
 	sleep 2 # give docker a moment i guess
+endif
 
 aufs:
 ifndef CI
diff --git a/tests/ci/parallel_runner.sh b/tests/ci/parallel_runner.sh
index 8a664b8b871..2bec642e809 100755
--- a/tests/ci/parallel_runner.sh
+++ b/tests/ci/parallel_runner.sh
@@ -3,7 +3,7 @@
 MODE="$1"; MODE=${MODE:="testing"}
 
 setup_circle() {
-  MAKE_ENV="CI=true DOCKER_VERSION=1.5.0"
+  MAKE_ENV="CI=true"
   [[ "$1" == "buildstack" ]] && MAKE_ENV+=" BUILD_STACK=true "
   echo "setting up with MAKE_ENV: $MAKE_ENV"
   sudo -E CI=true make -e sshcommand