diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b1f775ab..66440eb4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,14 +24,14 @@ jobs:
           - '2.2'
           - '3.1'
           - '3.2'
+          - '4.0'
         redis-version:
           - 'latest'
 
         # only test pre-release dependencies for the latest Python
         include:
-          # TODO: re-enable with https://github.com/jazzband/django-redis/issues/569
           # latest Django with pre-release redis
-          - django-version: '3.2'
+          - django-version: '4.0'
             redis-version: 'master'
             python-version: '3.10'
 
@@ -40,12 +40,19 @@ jobs:
             redis-version: 'latest'
             python-version: '3.10'
 
-          # TODO: re-enable with https://github.com/jazzband/django-redis/issues/569
           # pre-release Django and redis
           - django-version: 'main'
             redis-version: 'master'
             python-version: '3.10'
 
+        # exclude python 3.6 and 3.7 for django 4.x as they are not supported see https://docs.djangoproject.com/en/dev/releases/4.0/#python-compatibility
+        exclude:
+          - django-version: '4.0'
+            python-version: '3.6'
+
+          - django-version: '4.0'
+            python-version: '3.7'
+
     steps:
       - uses: actions/checkout@v2
 
diff --git a/changelog.d/579.misc b/changelog.d/579.misc
new file mode 100644
index 00000000..40467be7
--- /dev/null
+++ b/changelog.d/579.misc
@@ -0,0 +1 @@
+Add support for django 4
diff --git a/setup.cfg b/setup.cfg
index fa5d87f0..28c1fc1a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,6 +15,7 @@ classifiers =
     Framework :: Django :: 2.2
     Framework :: Django :: 3.1
     Framework :: Django :: 3.2
+    Framework :: Django :: 4.0
     Intended Audience :: Developers
     License :: OSI Approved :: BSD License
     Operating System :: OS Independent
@@ -71,9 +72,9 @@ envlist =
     isort
     mypy
     # tests against released versions
-    py{36,37,38,39,310}-dj{22,31,32}-redislatest
+    py{36,37,38,39,310}-dj{22,31,32,40}-redislatest
     # tests against unreleased versions
-    py310-dj32-redismaster
+    py310-dj40-redismaster
     py310-djmain-redis{latest,master}
 
 [gh-actions]
@@ -89,6 +90,7 @@ DJANGO =
     2.2: dj22
     3.1: dj31
     3.2: dj32
+    4.0: dj40
     main: djmain
 REDIS =
     latest: redislatest
@@ -113,6 +115,7 @@ deps =
     dj22: Django>=2.2,<2.3
     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
     msgpack>=0.6.0
     pytest