diff --git a/.travis.yml b/.travis.yml
index f1ec689f7..39efaf4fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,13 +9,16 @@ matrix:
 
       - { python: "3.6", env: DJANGO=2.2 }
       - { python: "3.6", env: DJANGO=3.0 }
+      - { python: "3.6", env: DJANGO=3.1 }
       - { python: "3.6", env: DJANGO=master }
 
       - { python: "3.7", env: DJANGO=2.2 }
       - { python: "3.7", env: DJANGO=3.0 }
+      - { python: "3.7", env: DJANGO=3.1 }
       - { python: "3.7", env: DJANGO=master }
 
       - { python: "3.8", env: DJANGO=3.0 }
+      - { python: "3.8", env: DJANGO=3.1 }
       - { python: "3.8", env: DJANGO=master }
 
       - { python: "3.8", env: TOXENV=base }
diff --git a/setup.py b/setup.py
index 99826b4d0..38e680e10 100755
--- a/setup.py
+++ b/setup.py
@@ -91,6 +91,7 @@ setup(
         'Framework :: Django',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
diff --git a/tox.ini b/tox.ini
index e5b8b6402..24d8e1558 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
 envlist =
        {py35,py36,py37}-django22,
        {py36,py37,py38}-django30,
+       {py36,py37,py38}-django31,
        {py36,py37,py38}-djangomaster,
        base,dist,lint,docs,
 
@@ -9,6 +10,7 @@ envlist =
 DJANGO =
     2.2: django22
     3.0: django30
+    3.1: django31
     master: djangomaster
 
 [testenv]
@@ -20,6 +22,7 @@ setenv =
 deps =
         django22: Django>=2.2,<3.0
         django30: Django>=3.0,<3.1
+        django31: Django>=3.0a1,<3.2
         djangomaster: https://github.com/django/django/archive/master.tar.gz
         -rrequirements/requirements-testing.txt
         -rrequirements/requirements-optionals.txt