diff --git a/dbtemplates/conf.py b/dbtemplates/conf.py
index 7ae23a6..2a420a3 100644
--- a/dbtemplates/conf.py
+++ b/dbtemplates/conf.py
@@ -54,5 +54,6 @@ class DbTemplatesConf(AppConf):
     def configure_use_redactor(self, value):
         if value and 'redactor' not in settings.INSTALLED_APPS:
             raise ImproperlyConfigured("Please add 'redactor' to your "
-                "INSTALLED_APPS setting to make use of it in dbtemplates.")
+                                       "INSTALLED_APPS setting to make "
+                                       "use of it in dbtemplates.")
         return value
diff --git a/dbtemplates/test_settings.py b/dbtemplates/test_settings.py
index a948cba..ac71738 100644
--- a/dbtemplates/test_settings.py
+++ b/dbtemplates/test_settings.py
@@ -1,3 +1,6 @@
+
+import django
+
 DBTEMPLATES_CACHE_BACKEND = 'dummy://'
 
 DATABASE_ENGINE = 'sqlite3'
@@ -29,4 +32,5 @@ TEMPLATE_LOADERS = (
     'dbtemplates.loader.Loader',
 )
 
-TEST_RUNNER = 'discover_runner.DiscoverRunner'
+if django.get_version() <= '1.6':
+    TEST_RUNNER = 'discover_runner.DiscoverRunner'