diff --git a/osx/Dockerfile b/osx/Dockerfile
index af3bc7566c..14e3949f59 100644
--- a/osx/Dockerfile
+++ b/osx/Dockerfile
@@ -26,10 +26,10 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
 
 # Download the Docker parts
 
-ENV DOCKER_VERSION 1.7.0
+ENV DOCKER_VERSION 1.7.1
 RUN curl -fsSL -o /docker.tgz https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION.tgz
 
-ENV DOCKER_MACHINE_VERSION 0.3.0
+ENV DOCKER_MACHINE_VERSION 0.3.1-rc1
 RUN curl -fsSL -o /docker-machine https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_darwin-amd64
 RUN chmod +x /docker-machine