diff --git a/.travis.yml b/.travis.yml
index cbd37f5f41..3dd7bae0f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,9 +12,12 @@ env:
   - TOXENV=py27-django111
   - TOXENV=py27-checkmigrations
   - TOXENV=py34-django111
+  - TOXENV=py34-django20
   - TOXENV=py35-django111
+  - TOXENV=py35-django20
   - TOXENV=py35-djangomaster
   - TOXENV=py36-django111
+  - TOXENV=py36-django20
   - TOXENV=py36-djangomaster
   - TOXENV=py36-checkmigrations
   - TOXENV=flake8
@@ -24,11 +27,15 @@ matrix:
   include:
     - python: "3.5"
       env: TOXENV=py35-django111
+    - python: "3.5"
+      env: TOXENV=py35-django20
     - python: "3.5"
       env: TOXENV=py35-djangomaster
   exclude:
     - python: "3.6"
       env: TOXENV=py35-django111
+    - python: "3.6"
+      env: TOXENV=py35-django20
     - python: "3.6"
       env: TOXENV=py35-djangomaster
   allow_failures:
diff --git a/setup.cfg b/setup.cfg
index 7a727617af..05d789f357 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,6 +20,7 @@ classifiers =
 	Programming Language :: Python :: 3.6
 	Framework :: Django
 	Framework :: Django :: 1.11
+	Framework :: Django :: 2.0
 
 [options]
 packages = find:
diff --git a/tox.ini b/tox.ini
index 3e0225587f..6936f1b43c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,9 @@
 [tox]
 envlist =
 	py27-django{110,111}
-	py34-django{110,111}
-	py35-django{110,111,master}
-	py36-django{110,111,master}
+	py34-django{110,111,20}
+	py35-django{110,111,20,master}
+	py36-django{110,111,20,master}
 	flake8
 	checkmigrations
 
@@ -14,6 +14,7 @@ commands = python runtests.py {posargs}
 deps =
 	-r{toxinidir}/tests/requirements.txt
 	django111: Django>=1.11,<2.0
+	django20: Django>=2.0,<2.1
 	djangomaster: https://github.com/django/django/archive/master.tar.gz
 
 [testenv:flake8]