diff --git a/.travis.yml b/.travis.yml
index 413f82248f..b45d6819f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ services:
 env:
   matrix:
     - DOCKERFILE="master"
+    - DOCKERFILE="7"
+    - DOCKERFILE="6"
 
 before_script:
   - docker version
diff --git a/6/Dockerfile b/6/Dockerfile
new file mode 100644
index 0000000000..c4713694f3
--- /dev/null
+++ b/6/Dockerfile
@@ -0,0 +1,10 @@
+FROM drupaldocker/php:cli
+MAINTAINER drupal-docker
+
+RUN apt-get update && apt-get install -y mysql-client \
+  && composer global require drush/drush:6.* \
+  && ln -s ~/.composer/vendor/bin/drush /usr/local/bin/drush \
+  && drush core-status -y \
+  && rm -rf /var/lib/apt/lists/*
+
+CMD ["drush", "core-cli"]
diff --git a/7/Dockerfile b/7/Dockerfile
new file mode 100644
index 0000000000..42fa55f2b6
--- /dev/null
+++ b/7/Dockerfile
@@ -0,0 +1,10 @@
+FROM drupaldocker/php:cli
+MAINTAINER drupal-docker
+
+RUN apt-get update && apt-get install -y mysql-client \
+  && composer global require drush/drush:7.* \
+  && ln -s ~/.composer/vendor/bin/drush /usr/local/bin/drush \
+  && drush core-status -y \
+  && rm -rf /var/lib/apt/lists/*
+
+CMD ["drush", "core-cli"]
diff --git a/master/Dockerfile b/master/Dockerfile
index 0c62cdcf9d..93958b1236 100644
--- a/master/Dockerfile
+++ b/master/Dockerfile
@@ -1,12 +1,11 @@
 FROM drupaldocker/php:cli
 MAINTAINER drupal-docker
 
-ADD http://files.drush.org/drush.phar /usr/local/bin/drush
-
 RUN apt-get update && apt-get install -y mysql-client \
-  && chmod a+x /usr/local/bin/drush; sync \
+  && composer global require drush/drush:dev-master \
+  && ln -s ~/.composer/vendor/bin/drush /usr/local/bin/drush \
   && drush core-status -y \
-  && drush init -y \
+  && drush core-init -y \
   && rm -rf /var/lib/apt/lists/*
 
 CMD ["drush", "core-cli"]