diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7d257b465..f1f734271 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Install Python dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install --upgrade tox tox-gh-actions
+        python -m pip install --upgrade tox tox-gh-actions django
 
     - name: Tox tests
       run: |
diff --git a/AUTHORS b/AUTHORS
index 68960486a..e47665e66 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -46,6 +46,7 @@ Michael Howitz
 Paul Dekkers
 Paul Oswald
 Pavel Tvrdík
+Peter Carnesciali
 Rodney Richardson
 Rustem Saiargaliev
 Sandro Rodrigues
diff --git a/docs/requirements.txt b/docs/requirements.txt
index c1f72699b..69501a2c6 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,4 +1,5 @@
 Django>=3.0,<3.1
 oauthlib>=3.1.0
 m2r>=0.2.1
+mistune<2
 .
diff --git a/oauth2_provider/__init__.py b/oauth2_provider/__init__.py
index ebb0b28b5..6ae4b308a 100644
--- a/oauth2_provider/__init__.py
+++ b/oauth2_provider/__init__.py
@@ -1,3 +1,7 @@
+import django
+
+
 __version__ = "1.5.0"
 
-default_app_config = "oauth2_provider.apps.DOTConfig"
+if django.VERSION < (3, 2):
+    default_app_config = "oauth2_provider.apps.DOTConfig"
diff --git a/tox.ini b/tox.ini
index 8371aab0a..ebd9ffb6e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -64,6 +64,7 @@ deps =
     sphinx<3
     oauthlib>=3.1.0
     m2r>=0.2.1
+    mistune<2
     sphinx-rtd-theme
     livedocs: sphinx-autobuild
     jwcrypto