diff --git a/gvaldap/gvaldap/settings/base.py b/gvaldap/gvaldap/settings/base.py
index c486b44..f985254 100644
--- a/gvaldap/gvaldap/settings/base.py
+++ b/gvaldap/gvaldap/settings/base.py
@@ -207,6 +207,11 @@ ROOT_URLCONF = '%s.urls' % SITE_NAME
 ########## END URL CONFIGURATION
 
 
+########## TEST RUNNER CONFIGURATION
+TEST_RUNNER = 'django.test.runner.DiscoverRunner'
+########## END TEST RUNNER CONFIGURATION
+
+
 ########## APP CONFIGURATION
 DJANGO_APPS = (
     # Default Django apps:
diff --git a/requirements/base.txt b/requirements/base.txt
index 21ac625..d0ff8dc 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,4 +1,4 @@
-Django==1.6.5
+Django==1.7.1
 django-ldapdb==0.3.2
 bpython==0.13
 django-braces==1.4.0