diff --git a/.travis.yml b/.travis.yml
index f89e77531..3e88247c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,13 @@ matrix:
       - { python: "3.6", env: DJANGO=2.0 }
       - { python: "3.6", env: DJANGO=2.1 }
       - { python: "3.6", env: DJANGO=2.2 }
+      - { python: "3.6", env: DJANGO=3.0 }
       - { python: "3.6", env: DJANGO=master }
 
       - { python: "3.7", env: DJANGO=2.0 }
       - { python: "3.7", env: DJANGO=2.1 }
       - { python: "3.7", env: DJANGO=2.2 }
+      - { python: "3.7", env: DJANGO=3.0 }
       - { python: "3.7", env: DJANGO=master }
 
       - { python: "3.8", env: DJANGO=master }
@@ -37,6 +39,7 @@ matrix:
 
     allow_failures:
       - env: DJANGO=master
+      - env: DJANGO=3.0
 
 install:
     - pip install tox tox-venv tox-travis
diff --git a/setup.py b/setup.py
index c9d6443d5..e15074396 100755
--- a/setup.py
+++ b/setup.py
@@ -93,6 +93,7 @@ setup(
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
diff --git a/tox.ini b/tox.ini
index 587c469b1..a3ac1f7ea 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ envlist =
        {py35,py36,py37}-django20,
        {py35,py36,py37}-django21
        {py35,py36,py37}-django22
+       {py36,py37,py38}-django30,
        {py36,py37,py38}-djangomaster,
        base,dist,lint,docs,
 
@@ -13,6 +14,7 @@ DJANGO =
     2.0: django20
     2.1: django21
     2.2: django22
+    3.0: django30
     master: djangomaster
 
 [testenv]
@@ -26,6 +28,7 @@ deps =
         django20: Django>=2.0,<2.1
         django21: Django>=2.1,<2.2
         django22: Django>=2.2,<3.0
+        django30: Django>=3.0b1,<3.1
         djangomaster: https://github.com/django/django/archive/master.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt