diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 15dceb0..3b29971 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,15 +9,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9', 'pypy-3.8']
-        django-version: ['3.2']
-        # Tox configuration for QA environment
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10', 'pypy-3.8']
+        django-version: ['3.2', '4.0']
         include:
+          # Tox configuration for QA environment
           - python-version: '3.8'
             django-version: 'qa'
-          # Django >= 3.2 only supports >= Python 3.8
-          - python-version: '3.10'
-            django-version: '3.2'
+          # Django main
           - python-version: '3.8'
             django-version: 'main'
             experimental: true
@@ -30,6 +28,12 @@ jobs:
           - python-version: 'pypy-3.8'
             django-version: 'main'
             experimental: true
+        exclude:
+          # Exclude Django 4.0 for Python 3.6 and 3.7
+          - python-version: '3.6'
+            django-version: '4.0'
+          - python-version: '3.7'
+            django-version: '4.0'
 
     steps:
     - uses: actions/checkout@v2
diff --git a/CHANGES.rst b/CHANGES.rst
index e8f73a9..5b11b36 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,8 @@ Changes
 
 - Drop Django < 3.2 support.
   [hramezani]
+- Add Django 4.0 to test matrix.
+  [hramezani]
 
 5.27.0 (2021-11-04)
 -------------------
diff --git a/pyproject.toml b/pyproject.toml
index fadd81f..16e7a6b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -11,7 +11,7 @@ legacy_tox_ini = """
 [tox]
 envlist =
     py{36,37,38,39,310}-dj32
-    py{38,39,310}-djmain
+    py{38,39,310}-dj{4.0, main}
     py38-djqa
 
 [gh-actions]
@@ -26,6 +26,7 @@ python =
 [gh-actions:env]
 DJANGO =
     3.2: dj32
+    4.0: dj40
     main: djmain
     qa: djqa
 
@@ -34,6 +35,7 @@ DJANGO =
 deps =
     -r requirements-test.txt
     dj32: django>=3.2,<3.3
+    dj40: django>=4.0,<4.1
     djmain: https://github.com/django/django/archive/main.tar.gz
 usedevelop = true
 commands = pytest
diff --git a/setup.py b/setup.py
index 4155fa9..6d8ef3a 100644
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,7 @@ setup(
         "Environment :: Plugins",
         "Framework :: Django",
         "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.0",
         "Intended Audience :: Developers",
         "Intended Audience :: System Administrators",
         "License :: OSI Approved :: MIT License",
diff --git a/tests/settings.py b/tests/settings.py
index 1f64a8d..43de0b4 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -65,8 +65,6 @@ SECRET_KEY = "too-secret-for-test"
 
 USE_I18N = False
 
-USE_L10N = False
-
 USE_TZ = False
 
 LOGIN_REDIRECT_URL = "/admin/"