diff --git a/.travis.yml b/.travis.yml
index 656e70c..2ae756d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,6 +72,10 @@ jobs:
       env: TOX_ENV=py36-dj30-sqlite
     - python: "3.6"
       env: TOX_ENV=py36-dj30-postgres
+    - python: "3.6"
+      env: TOX_ENV=py36-dj31-sqlite
+    - python: "3.6"
+      env: TOX_ENV=py36-dj31-postgres
     - python: "3.6"
       env: TOX_ENV=py36-djmaster-sqlite
     - python: "3.6"
@@ -92,6 +96,10 @@ jobs:
       env: TOX_ENV=py37-dj30-sqlite
     - python: "3.7"
       env: TOX_ENV=py37-dj30-postgres
+    - python: "3.7"
+      env: TOX_ENV=py37-dj31-sqlite
+    - python: "3.7"
+      env: TOX_ENV=py37-dj31-postgres
     - python: "3.7"
       env: TOX_ENV=py37-djmaster-sqlite
     - python: "3.7"
@@ -104,6 +112,10 @@ jobs:
       env: TOX_ENV=py38-dj30-sqlite
     - python: "3.8"
       env: TOX_ENV=py38-dj30-postgres
+    - python: "3.8"
+      env: TOX_ENV=py38-dj31-sqlite
+    - python: "3.8"
+      env: TOX_ENV=py38-dj31-postgres
     - python: "3.8"
       env: TOX_ENV=py38-djmaster-sqlite
     - python: "3.8"
diff --git a/setup.py b/setup.py
index f3b0b21..5fb2f95 100644
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,7 @@ setup(
         'Framework :: Django :: 2.1',
         'Framework :: Django :: 2.2',
         'Framework :: Django :: 3.0',
+        'Framework :: Django :: 3.1',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
diff --git a/tox.ini b/tox.ini
index 166c814..ee0c8aa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,9 +3,9 @@ envlist =
     py27-{dj17,dj18,dj19,dj110,dj111}-{sqlite,postgres},
     py34-{dj17,dj18,dj19,dj110,dj111,dj20}-{sqlite,postgres},
     py35-{dj18,dj19,dj110,dj111,dj20,dj21,dj22}-{sqlite,postgres},
-    py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,dj30,djmaster}-{sqlite,postgres},
-    py37-{dj20,dj21,dj22,dj30,djmaster}-{sqlite,postgres},
-    py38-{dj22,dj30,djmaster}-{sqlite,postgres},
+    py36-{dj18,dj19,dj110,dj111,dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres},
+    py37-{dj20,dj21,dj22,dj30,dj31,djmaster}-{sqlite,postgres},
+    py38-{dj22,dj30,dj31,djmaster}-{sqlite,postgres},
 [testenv]
 passenv = CI TRAVIS TRAVIS_*
 deps =
@@ -18,6 +18,7 @@ deps =
     dj21: Django == 2.1.*
     dj22: Django == 2.2.*
     dj30: Django == 3.0.*
+    dj30: Django == 3.1.*
     djmaster: https://github.com/django/django/archive/master.tar.gz
     # mysql: mysqlclient
     postgres: psycopg2-binary