diff --git a/.travis.yml b/.travis.yml
index 7c8a4c6a9..2559e712c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,10 +27,12 @@ matrix:
       env: TOXENV=py34-dj111
     - python: 3.5
       env: TOXENV=py35-dj111
-    - python: 3.5
-      env: TOXENV=py35-dj20
     - python: 3.6
       env: TOXENV=py36-dj111
+    - python: 3.4
+      env: TOXENV=py34-dj20
+    - python: 3.5
+      env: TOXENV=py35-dj20
     - python: 3.6
       env: TOXENV=py36-dj20
     - env: TOXENV=flake8
diff --git a/tox.ini b/tox.ini
index cd852521f..d58cbb16e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
     py{27,33,34}-dj18,
-    py{27,34,35}-dj{19,110,111},
-    py36-dj111
-    py{35,36}-dj20
+    py{27,34,35}-dj{19,110}
+    py{27,34,35,36}-dj111
+    py{34,35,36}-dj20
     flake8,
     isort,
     readme
@@ -14,7 +14,7 @@ deps =
     dj19: Django>=1.9,<1.10
     dj110: Django>=1.10,<1.11
     dj111: Django>=1.11,<2.0
-    dj20: Django==2.0rc1
+    dj20: Django>=2.0,<2.1
     coverage
     django_jinja
     html5lib
@@ -28,16 +28,20 @@ usedevelop = true
 commands = make coverage TEST_ARGS='{posargs:tests}'
 
 [testenv:flake8]
+basepython = python3
 commands = make flake8
 deps = flake8
 
 [testenv:isort]
+basepython = python3
 commands = make isort_check_only
 deps = isort
 
 [testenv:jshint]
+basepython = python3
 commands = make jshint
 
 [testenv:readme]
+basepython = python3
 commands = python setup.py check -r -s
 deps = readme_renderer