From e23a5f9a4730ddecb8f3950ee2936716f458c506 Mon Sep 17 00:00:00 2001
From: Florian Apolloner <florian@apolloner.eu>
Date: Sat, 11 May 2013 15:47:40 +0200
Subject: [PATCH] Fixed a regression in the test runner loading of runtests.py.

Refs #17365, #17366, #18727.
---
 tests/runtests.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/runtests.py b/tests/runtests.py
index cb124f2541..a18324f676 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -167,9 +167,12 @@ def django_tests(verbosity, interactive, failfast, test_labels):
     extra_tests = []
 
     # Run the test suite, including the extra validation tests.
-    from django.test.runner import DiscoverRunner
+    from django.test.utils import get_runner
+    if not hasattr(settings, 'TEST_RUNNER'):
+        settings.TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+    TestRunner = get_runner(settings)
 
-    test_runner = DiscoverRunner(
+    test_runner = TestRunner(
         verbosity=verbosity,
         interactive=interactive,
         failfast=failfast,