diff --git a/.travis.yml b/.travis.yml
index 589d9cc..6ffa67a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,9 +23,23 @@ python:
   - "3.6"
 
 env:
-  - TOXENV=py27-1.8.X,py34-1.8.X,py35-1.8.X
-  - TOXENV=py27-1.10.X,py34-1.10.X,py35-1.10.X
-  - TOXENV=py27-1.11.X,py34-1.11.X,py36-1.11.X
+  - TOXENV=py27-1.8.X
+  - TOXENV=py34-1.8.X
+  - TOXENV=py35-1.8.X
+
+  - TOXENV=py27-1.10.X
+  - TOXENV=py34-1.10.X
+  - TOXENV=py35-1.10.X
+
+  - TOXENV=py27-1.11.X
+  - TOXENV=py34-1.11.X
+  - TOXENV=py35-1.11.X
+  - TOXENV=py36-1.11.X
+
+  - TOXENV=py34-2.0.X
+  - TOXENV=py35-2.0.X
+  - TOXENV=py36-2.0.X
+
   - TOXENV=coverage
   - TOXENV=docs
   - TOXENV=qunit
diff --git a/tox.ini b/tox.ini
index b1a8314..429fb7c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,9 +3,15 @@
 # 1.8: 2.7, 3.2, 3.3, 3.4, 3.5
 # 1.10: 2.7, 3.4, 3.5
 # 1.11: 2.7, 3.4, 3.5, 3.6
+# 2.0: 3.4, 3.5, 3.6
 
 [tox]
-envlist = {py27,py34,py35}-1.8.X,{py27,py34,py35}-1.10.X,{py27,py34,py36}-1.11.X,coverage,docs,qunit
+envlist =
+    {py27,py34,py35}-1.8.X,
+    {py27,py34,py35}-1.10.X,
+    {py27,py34,py35,py36}-1.11.X,
+    {py34,py35,py36}-{2.0}.X,
+    coverage,docs,qunit
 
 [testenv]
 passenv = TRAVIS DISPLAY
@@ -18,6 +24,7 @@ deps =
     1.8.X: Django>=1.8,<1.9
     1.10.X: Django>=1.10,<1.11
     1.11.X: Django>=1.11,<2.0
+    2.0.X: Django>=2.0,<2.1
     Jinja2
     selenium
 whitelist_externals = make