diff --git a/Dockerfile b/Dockerfile
index d7a6019aa..1b016e9ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,13 +15,18 @@ RUN set -ex; \
     ; \
     rm -rf /var/lib/apt/lists/*
 
-ENV ALL_DOCKER_VERSIONS 1.3.3 1.4.1 1.5.0
+# ENV ALL_DOCKER_VERSIONS 1.6.0
 
-RUN set -ex; \
-    for v in ${ALL_DOCKER_VERSIONS}; do \
-        curl https://get.docker.com/builds/Linux/x86_64/docker-$v -o /usr/local/bin/docker-$v; \
-        chmod +x /usr/local/bin/docker-$v; \
-    done
+# RUN set -ex; \
+#     for v in ${ALL_DOCKER_VERSIONS}; do \
+#         curl https://get.docker.com/builds/Linux/x86_64/docker-$v -o /usr/local/bin/docker-$v; \
+#         chmod +x /usr/local/bin/docker-$v; \
+#     done
+
+# Temporarily use dev version of Docker
+ENV ALL_DOCKER_VERSIONS dev
+RUN curl https://master.dockerproject.com/linux/amd64/docker-1.5.0-dev > /usr/local/bin/docker-dev
+RUN chmod +x /usr/local/bin/docker-dev
 
 RUN useradd -d /home/user -m -s /bin/bash user
 WORKDIR /code/
diff --git a/script/test-versions b/script/test-versions
index a9e3bc4c7..d44cc9a7b 100755
--- a/script/test-versions
+++ b/script/test-versions
@@ -11,14 +11,14 @@ script/validate-dco
 flake8 compose
 
 if [ "$DOCKER_VERSIONS" == "" ]; then
-  DOCKER_VERSIONS="1.5.0"
+  DOCKER_VERSIONS="dev"
 elif [ "$DOCKER_VERSIONS" == "all" ]; then
   DOCKER_VERSIONS="$ALL_DOCKER_VERSIONS"
 fi
 
 for version in $DOCKER_VERSIONS; do
   >&2 echo "Running tests against Docker $version"
-  docker-1.5.0 run \
+  docker-$version run \
     --rm \
     --privileged \
     --volume="/var/lib/docker" \