diff --git a/AUTHORS b/AUTHORS
index ef4e773f5..84fc2a7aa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -12,6 +12,7 @@ Adam Johnson
 Adam Zahradník
 Adheeth P Praveen
 Alan Crosswell
+Alan Rominger
 Alejandro Mantecon Guillen
 Aleksander Vaskevich
 Alessandro De Angelis
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67bf633cf..0a7185824 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * #1284 Allow to logout with no id_token_hint even if the browser session already expired
 * #1296 Added reverse function in migration 0006_alter_application_client_secret
 * #1336 Fix encapsulation for Redirect URI scheme validation
+* #1357 Move import of setting_changed signal from test to django core modules
 
 ### Removed
 * #1350 Remove support for Python 3.7 and Django 2.2
diff --git a/oauth2_provider/settings.py b/oauth2_provider/settings.py
index c5af9ebae..1672b40df 100644
--- a/oauth2_provider/settings.py
+++ b/oauth2_provider/settings.py
@@ -18,8 +18,8 @@
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
+from django.core.signals import setting_changed
 from django.http import HttpRequest
-from django.test.signals import setting_changed
 from django.urls import reverse
 from django.utils.module_loading import import_string
 from oauthlib.common import Request