diff --git a/.travis.yml b/.travis.yml
index b8528b4..4fcb9fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,6 +48,8 @@ matrix:
       python: 3.4
     - env: TOXENV=py34-django111
       python: 3.4
+    - env: TOXENV=py34-django20
+      python: 3.4
     - env: TOXENV=py35-django18
       python: 3.5
     - env: TOXENV=py35-django19
@@ -56,6 +58,8 @@ matrix:
       python: 3.5
     - env: TOXENV=py35-django111
       python: 3.5
+    - env: TOXENV=py35-django20
+      python: 3.5
 
 
 notifications:
diff --git a/tox.ini b/tox.ini
index 9b12795..653e301 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,24 @@
 [tox]
 envlist =
-    py35-django111, py35-django110, py35-django19, py35-django18,
-    py34-django111, py34-django110, py34-django19, py34-django18, py34-django17, py34-django16,
+    py35-django20, py35-django111, py35-django110, py35-django19, py35-django18,
+    py34-django20, py34-django111, py34-django110, py34-django19, py34-django18, py34-django17, py34-django16,
     py33-django18, py33-django17, py33-django16, py33-django15,
     py27-django111, py27-django110, py27-django19, py27-django18, py27-django17, py27-django16, py27-django15, py27-django14,
 
 [testenv]
 commands = python setup.py test
 
+[testenv:py35-django20]
+basepython = python3.5
+deps =
+    Django>=2.0,<2.1
+    django-nose==1.4.5
+
 [testenv:py35-django111]
 basepython = python3.5
 deps =
-    Django>=1.11a1,<1.12
-    django-nose==1.4.4
+    Django>=1.11,<1.12
+    django-nose==1.4.5
 
 [testenv:py35-django110]
 basepython = python3.5
@@ -32,11 +38,17 @@ deps =
     Django>=1.8,<1.9
     django-nose==1.4.2
 
+[testenv:py34-django20]
+basepython = python3.4
+deps =
+    Django>=2.0,<2.1
+    django-nose==1.4.5
+
 [testenv:py34-django111]
 basepython = python3.4
 deps =
-    Django>=1.11a1,<1.12
-    django-nose==1.4.4
+    Django>=1.11,<1.12
+    django-nose==1.4.5
 
 [testenv:py34-django110]
 basepython = python3.4
@@ -95,8 +107,8 @@ deps =
 [testenv:py27-django111]
 basepython = python2.7
 deps =
-    Django>=1.11a1,<1.12
-    django-nose==1.4.4
+    Django>=1.11,<1.12
+    django-nose==1.4.5
 
 [testenv:py27-django110]
 basepython = python2.7