2 files changed, 16 insertions, 11 deletions
diff --git a/django/test/utils.py b/django/test/utils.py
index 0101919d11..da77d8ef4e 100644
--- a/django/test/utils.py
+++ b/django/test/utils.py
@@ -616,3 +616,18 @@ def override_script_prefix(prefix):
     Decorator or context manager to temporary override the script prefix.
     """
     return ScriptPrefix(prefix)
+
+
+class LoggingCaptureMixin(object):
+    """
+    Capture the output from the 'django' logger and store it on the class's
+    logger_output attribute.
+    """
+    def setUp(self):
+        self.logger = logging.getLogger('django')
+        self.old_stream = self.logger.handlers[0].stream
+        self.logger_output = six.StringIO()
+        self.logger.handlers[0].stream = self.logger_output
+
+    def tearDown(self):
+        self.logger.handlers[0].stream = self.old_stream
diff --git a/django/utils/log.py b/django/utils/log.py
index 7ccc532a05..22452f994c 100644
--- a/django/utils/log.py
+++ b/django/utils/log.py
@@ -40,17 +40,7 @@ DEFAULT_LOGGING = {
     },
     'loggers': {
         'django': {
-            'handlers': ['console'],
-        },
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': False,
-        },
-        'django.security': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': False,
+            'handlers': ['console', 'mail_admins'],
         },
         'py.warnings': {
             'handlers': ['console'],