diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f5e25e6..93d4cce 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,16 +11,20 @@ jobs:
       max-parallel: 5
       matrix:
         python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
-        django-version: ['2.2', '3.1', '3.2', 'main']
+        django-version: ['2.2', '3.1', '3.2', '4.0', 'main']
         exclude:
         # Django prior to 3.2 does not support Python 3.10
         - django-version: '2.2'
           python-version: '3.10'
         - django-version: '3.1'
           python-version: '3.10'
-        # Django after 3.2 drop support for Python prior to 3.8
+        # Django after 3.2 dropped support for Python prior to 3.8
+        - django-version: '4.0'
+          python-version: '3.6'
         - django-version: 'main'
           python-version: '3.6'
+        - django-version: '4.0'
+          python-version: '3.7'
         - django-version: 'main'
           python-version: '3.7'
 
diff --git a/tox.ini b/tox.ini
index 72c46c4..9078c64 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist =
     py{36,37,38,39,310}-dj{22,31,32}
-    py{38,39,310}-djmain
+    py{38,39,310}-dj{40,main}
     lint
     sphinx
     readme
@@ -19,6 +19,7 @@ DJANGO =
     2.2: dj22
     3.1: dj31
     3.2: dj32
+    4.0: dj40
     main: djmain
 
 [testenv]
@@ -27,6 +28,7 @@ deps =
     dj22: Django>=2.2,<3.0
     dj31: Django>=3.1,<3.2
     dj32: Django>=3.2,<3.3
+    dj40: Django>=4.0,<4.1
     djmain: https://github.com/django/django/archive/main.tar.gz
     pytest
     pytest-cov