diff --git a/.travis.yml b/.travis.yml
index c6931de..277568f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,37 @@
 language: python
+dist: xenial
+sudo: true
 python:
-  - "3.5"
+  - 2.7
+  - 3.4
+  - 3.5
+  - 3.6
 env:
-  - TOXENV=py27-django15
-  - TOXENV=py27-django16
-  - TOXENV=py27-django17
-  - TOXENV=py27-django18
-  - TOXENV=py27-django19
-  - TOXENV=py27-django110
-  - TOXENV=py27-django111
-  - TOXENV=py34-django15
-  - TOXENV=py34-django16
-  - TOXENV=py34-django17
-  - TOXENV=py34-django18
-  - TOXENV=py34-django19
-  - TOXENV=py34-django110
-  - TOXENV=py34-django111
-  - TOXENV=py35-django18
-  - TOXENV=py35-django19
-  - TOXENV=py34-django110
-  - TOXENV=py34-django111
-  - TOXENV=flake8
-#  - TOXENV=sphinx
-#  - TOXENV=readme
+  - DJANGO="1.8"
+  - DJANGO="1.9"
+  - DJANGO="1.10"
+  - DJANGO="1.11"
+  - DJANGO="2.0"
+  - DJANGO="2.1"
+  - DJANGO="2.2"
+matrix:
+  - exclude:
+    - python: 2.7
+      env: DJANGO="2.0"
+
+    - python: 2.7
+      env: DJANGO="2.1"
+
+    - python: 3.4
+      env: DJANGO="2.1"
+
+    - python: 2.7
+      env: DJANGO="2.2"
+
+    - python: 3.4
+      env: DJANGO="2.2"
 install:
+  - pip install tox
+  - pip install -q tox-travis
 script:
-  - make test
+  - tox
diff --git a/demo/demoproject/compat.py b/demo/demoproject/compat.py
new file mode 100644
index 0000000..6930bf5
--- /dev/null
+++ b/demo/demoproject/compat.py
@@ -0,0 +1,11 @@
+
+try:
+    from django.conf.urls import patterns
+except Exception:
+    def urlpatterns(prefix, *args):
+        return list(args)
+
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
diff --git a/tox.ini b/tox.ini
index 1f9b5d5..e2e6130 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,20 +1,27 @@
 [tox]
-envlist = py{27}-django{15,16,17,18,19,110,111}, py{33,34}-django{15,16,17}, py{34,35}-django{18,19,110,111}, flake8, sphinx, readme
+envlist = py{27}-django{18,19,110,111},
+          py{34,35,36}-django{18,19,110,111,20,21,22},
+          flake8, sphinx, readme
+
+[tox:travis]
+2.7 = py27
+3.4 = py34
+3.5 = py35
+3.6 = py36, flake8, sphinx, readme
+
+[travis:env]
+DJANGO =
+    1.8: django18
+    1.9: django19
+    1.10: django110
+    1.11: django111
+    2.0: django20
+    2.1: django21
+    2.2: django22
 
 [testenv]
-basepython =
-    py27: python2.7
-    py33: python3.3
-    py34: python3.4
-    py35: python3.5
 deps =
     coverage
-    django15: Django>=1.5,<1.6
-    django15: django-nose<1.4.3
-    django16: Django>=1.6,<1.7
-    django16: django-nose<1.4.3
-    django17: Django>=1.7,<1.8
-    django17: django-nose<1.4.3
     django18: Django>=1.8,<1.9
     django18: django-nose>=1.4.2
     django19: Django>=1.9,<1.10
@@ -23,12 +30,15 @@ deps =
 	django110: django-nose>=1.4.4
     django111: Django>=1.11,<2.0
     django111: django-nose>=1.4.5
+    django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<3.0
     nose
     py27: mock
 commands =
     pip install -e .
     pip install -e demo
-    demo test --cover-package=django_downloadview --cover-package=demoproject {posargs: tests demoproject}
+    python -Wd {envbindir}/demo test --cover-package=django_downloadview --cover-package=demoproject {posargs: tests demoproject}
     coverage erase
     pip freeze
 
@@ -62,7 +72,7 @@ whitelist_externals =
     mkdir
 
 [testenv:release]
-basepython = python3.5
+basepython = python3.6
 deps =
     wheel
     zest.releaser