diff --git a/script/test_docker b/script/test_docker
index 75b7cddf970..6d17492f703 100755
--- a/script/test_docker
+++ b/script/test_docker
@@ -10,4 +10,4 @@ docker build -t home-assistant-test -f virtualization/Docker/Dockerfile.dev .
 docker run --rm \
     -v `pwd`/.tox/:/usr/src/app/.tox/ \
     -t -i home-assistant-test \
-    tox -e py35
+    tox -e py36
diff --git a/virtualization/Docker/Dockerfile.dev b/virtualization/Docker/Dockerfile.dev
index 0d546d12eb0..2f40ea5f409 100644
--- a/virtualization/Docker/Dockerfile.dev
+++ b/virtualization/Docker/Dockerfile.dev
@@ -2,7 +2,7 @@
 # Based on the production Dockerfile, but with development additions.
 # Keep this file as close as possible to the production Dockerfile, so the environments match.
 
-FROM python:3.5
+FROM python:3.6
 MAINTAINER Paulus Schoutsen <Paulus@PaulusSchoutsen.nl>
 
 # Uncomment any of the following lines to disable the installation.
@@ -37,11 +37,11 @@ RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - && \
 RUN pip3 install --no-cache-dir tox
 
 # Copy over everything required to run tox
-COPY requirements_test.txt setup.cfg setup.py tox.ini ./
+COPY requirements_test_all.txt setup.cfg setup.py tox.ini ./
 COPY homeassistant/const.py homeassistant/const.py
 
 # Prefetch dependencies for tox
-RUN tox -e py35 --notest
+RUN tox -e py36 --notest
 
 # END: Development additions