diff --git a/.travis.yml b/.travis.yml
index 120eded..8623917 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ env:
 - TOXENV=py34-django110
 - TOXENV=py27-django111
 - TOXENV=py34-django111
+- TOXENV=py34-django20
 matrix:
   include:
     - python: 3.5
@@ -18,10 +19,14 @@ matrix:
       env: TOXENV=py35-django-110
     - python: 3.5
       env: TOXENV=py35-django-111
+    - python: 3.5
+      env: TOXENV=py35-django-20
     - python: 3.5
       env: TOXENV=py35-django-master
     - python: 3.6
       env: TOXENV=py36-django-111
+    - python: 3.6
+      env: TOXENV=py36-django-20
     - python: 3.6
       env: TOXENV=py36-django-master
   allow_failures:
diff --git a/HISTORY.rst b/HISTORY.rst
index e9c654a..ea0f5b7 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,7 @@ X.Y.Z (YYYY-MM-DD)
 ------------------
 
 * Added testing for Python 3.6.
+* Confirmed support for Django 2.0.
 
 1.8.0 (2017-02-03)
 ------------------
diff --git a/setup.py b/setup.py
index 233db57..d7c31c7 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,7 @@
         'Framework :: Django :: 1.9',
         'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
+        'Framework :: Django :: 2.0',
         'Intended Audience :: Developers',
         'Natural Language :: English',
         'License :: OSI Approved :: BSD License',
diff --git a/tox.ini b/tox.ini
index 6f8fccf..fcd5160 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
 [tox]
 envlist =
     py{27,34,35}-django1{8,9,10,11}
+    py{34,35,36}-django20
     py36-django111
     py{35,36}-master
 
@@ -18,4 +19,5 @@ deps=
     django-19: Django>=1.9a1,<1.10
     django-110: Django>=1.10,<1.11
     django-111: Django>=1.11a1,<2.0
+    django-20: Django>=2.0a1,<2.1
     django-master: https://github.com/django/django/archive/master.tar.gz