diff --git a/Dockerfile b/Dockerfile
index 4668353cedfbd87129395b29ffd5873d27599f17..fbd6223ffde6e9caeb0b04bd06a87efb55b24592 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.5
+FROM python:3.6
 MAINTAINER Thom Wiggers <thom@thomwiggers.nl>
 LABEL description="Contains the Thaliawebsite Django application"
 
diff --git a/tox.ini b/tox.ini
index 21dd6317c4c0789d4b5eea1f01af77832a19b746..6204b2443f9de51fc93217daa30568df030f0986 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = flake8, {py35,py36,py37}-django20, {py35,py36,py37}-django21
+envlist = flake8, {py36,py37}-django20, {py36,py37}-django21
 skipsdist = True
 skip_missing_interpreters = True
 
@@ -26,6 +26,7 @@ env =
     PIPENV_SUPPRESS_NESTED_WARNING=1
 
 [testenv:flake8]
+basepython=python36
 deps= flake8
 skip_install=True
 commands=