diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 258583bc8..a0f6a0c3f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,18 +11,22 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.5', '3.6', '3.7', '3.8']
-        django-version: ['2.2', '3.0', master]
+        django-version: ['2.2', '3.0', '3.1', master]
         variant: [normal, yubikey, custom_user]
         experimental: ['true', 'false']
         exclude:
           - python-version: '3.5'
             django-version: '3.0'
+          - python-version: '3.5'
+            django-version: '3.1'
           - python-version: '3.5'
             django-version: master
           - django-version: '2.2'
             experimental: 'true'
           - django-version: '3.0'
             experimental: 'true'
+          - django-version: '3.1'
+            experimental: 'true'
           - django-version: master
             experimental: 'false'
 
diff --git a/.travis.yml b/.travis.yml
index d3c4fa6c3..4f5aa16f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,6 +10,7 @@ python:
 env:
  - DJANGO=2.2 VARIANT=normal
  - DJANGO=3.0 VARIANT=normal
+ - DJANGO=3.1 VARIANT=normal
  - DJANGO=master VARIANT=normal
 
 matrix:
@@ -44,6 +45,19 @@ matrix:
     - python: 3.8
       env: DJANGO=3.0 VARIANT=custom_user
 
+    - python: 3.6
+      env: DJANGO=3.1 VARIANT=yubikey
+    - python: 3.6
+      env: DJANGO=3.1 VARIANT=custom_user
+    - python: 3.7
+      env: DJANGO=3.1 VARIANT=yubikey
+    - python: 3.7
+      env: DJANGO=3.1 VARIANT=custom_user
+    - python: 3.8
+      env: DJANGO=3.1 VARIANT=yubikey
+    - python: 3.8
+      env: DJANGO=3.1 VARIANT=custom_user
+
     - python: 3.6
       env: DJANGO=master VARIANT=yubikey
     - python: 3.6
diff --git a/setup.py b/setup.py
index 23a2f0d5d..79267ebfc 100644
--- a/setup.py
+++ b/setup.py
@@ -32,6 +32,7 @@
         'Framework :: Django',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
diff --git a/tox.ini b/tox.ini
index eb4028249..274e87787 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ minversion = 1.8
 envlist =
     py{35,36,37,38}-dj22-{normal,yubikey,custom_user},
     py{36,37,38}-dj30-{normal,yubikey,custom_user},
+    py{36,37,38}-dj31-{normal,yubikey,custom_user},
     py{36,37,38}-djmaster-{normal,yubikey,custom_user}
 skipsdist = True
 
@@ -14,6 +15,7 @@ unignore_outcomes = True
 DJANGO =
     2.2: dj22
     3.0: dj30
+    3.1: dj31
     master: djmaster
 VARIANT =
     normal: normal
@@ -31,6 +33,7 @@ python =
 DJANGO =
     2.2: dj22
     3.0: dj30
+    3.1: dj31
     master: djmaster
 VARIANT =
     normal: normal
@@ -48,9 +51,9 @@ basepython =
     py37: python3.7
     py38: python3.8
 deps =
-    dj111: Django<1.12
     dj22: Django<2.3
     dj30: Django<3.1
+    dj31: Django<3.2
     djmaster: https://github.com/django/django/archive/master.tar.gz
     yubikey: django-otp-yubikey
     coverage