diff --git a/Makefile b/Makefile
index cba8682e55..f60c10b0c5 100644
--- a/Makefile
+++ b/Makefile
@@ -175,7 +175,7 @@ test_tox:
 
 # Run unit tests to produce output for Jenkins.
 test_jenkins:
-	$(PYTHON) manage.py jenkins -v2
+	DJANGO_SETTINGS_MODULE="awx.settings.jenkins" $(PYTHON) manage.py jenkins -v2
 
 package.json:
 	sed -e 's/%NAME%/$(NAME)/;s/%VERSION%/$(VERSION)/' packaging/grunt/package.template > $@
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 7bc54d9f15..e9902ab279 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -272,14 +272,6 @@ DEVSERVER_MODULES = (
     #'devserver.modules.profile.LineProfilerModule',
 )
 
-# Use Django-Jenkins if installed.  Only run tests for awx.main app.
-try:
-    import django_jenkins
-    INSTALLED_APPS += ('django_jenkins',)
-    PROJECT_APPS = ('awx.main', 'awx.api',)
-except ImportError:
-    pass
-
 # Set default ports for live server tests.
 os.environ.setdefault('DJANGO_LIVE_TEST_SERVER_ADDRESS', 'localhost:9013-9199')
 
@@ -497,19 +489,3 @@ LOGGING = {
         },
     }
 }
-
-if 'django_jenkins' in INSTALLED_APPS:
-    JENKINS_TASKS = (
-        'django_jenkins.tasks.run_pylint',
-        'django_jenkins.tasks.with_coverage',
-        'django_jenkins.tasks.django_tests',
-        'django_jenkins.tasks.run_pep8',
-        'django_jenkins.tasks.run_pyflakes',
-        'django_jenkins.tasks.run_jshint',
-        'django_jenkins.tasks.run_csslint',
-        )
-    PEP8_RCFILE = "setup.cfg"
-    CSSLINT_CHECKED_FILES = [os.path.join(BASE_DIR, 'ui/static/less')]
-    JSHINT_CHECKED_FILES = [os.path.join(BASE_DIR, 'ui/static/js'),
-                            os.path.join(BASE_DIR, 'ui/static/lib/ansible'),]
-
diff --git a/awx/settings/jenkins.py b/awx/settings/jenkins.py
new file mode 100644
index 0000000000..2253314747
--- /dev/null
+++ b/awx/settings/jenkins.py
@@ -0,0 +1,41 @@
+# Copyright (c) 2014 AnsibleWorks, Inc.
+# All Rights Reserved.
+
+# Test settings for AWX project.
+
+# Python
+import sys
+import traceback
+
+# Django Split Settings
+from split_settings.tools import optional, include
+
+# Load development settings.
+from defaults  import *
+
+# Load development settings.
+from development import *
+
+# Disable capturing DEBUG
+DEBUG = False
+TEMPLATE_DEBUG = DEBUG
+SQL_DEBUG = DEBUG
+
+# Use Django-Jenkins if installed. Only run tests for awx.main app.
+import django_jenkins
+INSTALLED_APPS += ('django_jenkins',)
+PROJECT_APPS = ('awx.main', 'awx.api',)
+
+JENKINS_TASKS = (
+    'django_jenkins.tasks.run_pylint',
+    'django_jenkins.tasks.with_coverage',
+    'django_jenkins.tasks.django_tests',
+    'django_jenkins.tasks.run_pep8',
+    'django_jenkins.tasks.run_pyflakes',
+    'django_jenkins.tasks.run_jshint',
+    'django_jenkins.tasks.run_csslint',
+    )
+PEP8_RCFILE = "setup.cfg"
+CSSLINT_CHECKED_FILES = [os.path.join(BASE_DIR, 'ui/static/less/*.less')]
+JSHINT_CHECKED_FILES = [os.path.join(BASE_DIR, 'ui/static/js'),
+                        os.path.join(BASE_DIR, 'ui/static/lib/ansible'),]