diff --git a/doc/source/conf.py b/doc/source/conf.py
index c158796260..2961a7d3fa 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,7 +33,7 @@ ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
 sys.path.insert(0, ROOT)
 
 # This is required for ReadTheDocs.org, but isn't a bad idea anyway.
-os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings'
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'openstack_dashboard.settings')
 
 import horizon.version
 
diff --git a/run_tests.sh b/run_tests.sh
index 5cdc9b3964..2f55dc84e4 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -158,7 +158,7 @@ function run_pep8 {
 
 function run_sphinx {
     echo "Building sphinx..."
-    ${command_wrapper} python setup.py build_sphinx
+    DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings ${command_wrapper} python setup.py build_sphinx
     echo "Build complete."
 }
 
diff --git a/tox.ini b/tox.ini
index f59b720e40..03d0225e85 100644
--- a/tox.ini
+++ b/tox.ini
@@ -45,7 +45,7 @@ basepython = python2.6
 commands = /bin/bash run_tests.sh -N --integration {posargs}
 
 [testenv:docs]
-setenv = DJANGO_SETTINGS_MODULE=openstack_auth.tests.settings
+setenv = DJANGO_SETTINGS_MODULE=openstack_dashboard.test.settings
 commands = python setup.py build_sphinx
 
 [tox:jenkins]