diff --git a/setup.py b/setup.py
index 8af4679f4..1a41d5668 100755
--- a/setup.py
+++ b/setup.py
@@ -109,7 +109,7 @@ setup(name="authentic2",
       },
       include_package_data=True,
       install_requires=[
-          'django>=1.8,<1.9',
+          'django>=1.8,<2.0',
           'requests>=2.3',
           'django-model-utils>=2.4',
           'dnspython>=1.10',
diff --git a/tox.ini b/tox.ini
index e9f54f511..c79a961ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@
 
 [tox]
 toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/authentic/{env:BRANCH_NAME:}
-envlist = coverage-dj18-{authentic,rbac}-{pg,sqlite}
+envlist = coverage-{dj18,dj111}-{authentic,rbac}-{pg,sqlite}
 
 [testenv]
 # django.contrib.auth is not tested it does not work with our templates
@@ -27,6 +27,7 @@ usedevelop =
 deps = 
   pip > 9
   dj18: django>1.8,<1.9
+  dj111: django<2.0
   pg: psycopg2
   coverage
   pytest-cov