diff --git a/.travis.yml b/.travis.yml
index 99ea655..992a307 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,19 @@ python:
 - '3.5'
 - '3.6'
 cache: pip
+env:
+  - DJANGO="2.0"
+  - DJANGO="1.11"
 install:
 - travis_retry pip install tox-travis
 script:
 - tox
+
+matrix:
+  fast_finish: true
+  exclude:
+    - env: DJANGO="2.0"
+      python: 2.7
 jobs:
   include:
   - stage: flake8
diff --git a/tox.ini b/tox.ini
index 33eff3f..a21979a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,17 @@ envlist =
     readme
 skipsdist = True
 
+[travis]
+python =
+    2.7: py27
+    3.5: py35
+    3.6: py36,flake8,readme
+
+[travis:env]
+DJANGO =
+    1.11: dj111
+    2.0: dj20
+
 [testenv]
 deps =
     dj111: Django>=1.11,<1.12