diff --git a/.travis.yml b/.travis.yml
index 8f8005d..e322d5e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,13 @@ python: "3.6"
 env:
   - TOXENV=py27-django111
   - TOXENV=py34-django111
-  - TOXENV=py34-django200
+  - TOXENV=py34-django20
   - TOXENV=py35-django111
-  - TOXENV=py35-django200
+  - TOXENV=py35-django20
   - TOXENV=py35-djangomaster
   - TOXENV=py36-django111
-  - TOXENV=py36-django200
+  - TOXENV=py36-django20
+  - TOXENV=py36-django21
   - TOXENV=py36-djangomaster
   # XXX: Use a matrix to build these?
   - TOXENV=py36-django111-postgres DB=postgres
@@ -32,7 +33,7 @@ matrix:
     - python: "3.5"
       env: TOXENV=py35-django111
     - python: "3.5"
-      env: TOXENV=py35-django200
+      env: TOXENV=py35-django20
     - python: "3.5"
       env: TOXENV=py35-djangomaster
   exclude:
@@ -41,7 +42,7 @@ matrix:
     - python: "3.6"
       env: TOXENV=py35-django111
     - python: "3.6"
-      env: TOXENV=py35-django200
+      env: TOXENV=py35-django20
     - python: "3.6"
       env: TOXENV=py35-djangomaster
   allow_failures:
diff --git a/tox.ini b/tox.ini
index 6c96640..773a725 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
 	py27-django{111}
-	py34-django{111,200}
-	py35-django{111,200,master}
-	py36-django{111,200,master}
+	py34-django{111,20}
+	py35-django{111,20,master}
+	py36-django{111,20,21,master}
 	docs
 
 [testenv]
@@ -15,7 +15,8 @@ deps =
 	coverage
 	dj-database-url
 	django111: Django >= 1.11, < 2.0
-	django200: Django ~= 2.0.0
+	django20: Django ~= 2.0
+	django21: Django ~= 2.1
 	djangomaster: https://github.com/django/django/archive/master.tar.gz
 	postgres: psycopg2
 commands =