diff --git a/doc/source/execution.rst b/doc/source/execution.rst
index 6946cf48f..78e51ed9c 100644
--- a/doc/source/execution.rst
+++ b/doc/source/execution.rst
@@ -2,10 +2,10 @@ Configuration File
 ------------------
 
 After installation, you will need to create a configuration file.  By
-default, ``jenkins-jobs`` looks in
-``/etc/jenkins_jobs/jenkins_jobs.ini`` but you may specify an
-alternative location when running ``jenkins-jobs``.  The file should have
-the following format:
+default, ``jenkins-jobs`` looks for ``~/.config/jenkins_jobs/jenkins_jobs.ini``,
+``<script directory>/jenkins_jobs.ini`` or ``/etc/jenkins_jobs/jenkins_jobs.ini``
+(in that order), but you may specify an alternative location when running
+``jenkins-jobs``.  The file should have the following format:
 
 .. literalinclude:: ../../etc/jenkins_jobs.ini-sample
    :language: ini
diff --git a/jenkins_jobs/cmd.py b/jenkins_jobs/cmd.py
index 584e07b8d..c36d92a99 100755
--- a/jenkins_jobs/cmd.py
+++ b/jenkins_jobs/cmd.py
@@ -179,17 +179,28 @@ def main(argv=None):
     execute(options, config)
 
 
-def setup_config_settings(options):
-
+def get_config_file(options):
+    # Initialize with the global fallback location for the config.
     conf = '/etc/jenkins_jobs/jenkins_jobs.ini'
     if options.conf:
         conf = options.conf
     else:
-        # Fallback to script directory
+        # Allow a script directory config to override.
         localconf = os.path.join(os.path.dirname(__file__),
                                  'jenkins_jobs.ini')
         if os.path.isfile(localconf):
             conf = localconf
+        # Allow a user directory config to override.
+        userconf = os.path.join(os.path.expanduser('~'), '.config',
+                                'jenkins_jobs', 'jenkins_jobs.ini')
+        if os.path.isfile(userconf):
+            conf = userconf
+    return conf
+
+
+def setup_config_settings(options):
+
+    conf = get_config_file(options)
     config = configparser.ConfigParser()
     # Load default config always
     config.readfp(StringIO(DEFAULT_CONF))
diff --git a/tests/cmd/subcommands/test_test.py b/tests/cmd/subcommands/test_test.py
index 5a834c602..97459ddde 100644
--- a/tests/cmd/subcommands/test_test.py
+++ b/tests/cmd/subcommands/test_test.py
@@ -6,11 +6,11 @@ import jenkins
 
 from jenkins_jobs import cmd
 from jenkins_jobs.errors import JenkinsJobsException
+from mock import patch
 from tests.base import mock
 from tests.cmd.test_cmd import CmdTestsBase
 from tests.cmd.test_recurse_path import fake_os_walk
 
-
 os_walk_return_values = {
     '/jjb_projects': [
         ('/jjb_projects', (['dir1', 'dir2', 'dir3'], ())),
@@ -43,6 +43,30 @@ def os_walk_side_effects(path_name, topdown):
     return fake_os_walk(os_walk_return_values[path_name])(path_name, topdown)
 
 
+@mock.patch('jenkins_jobs.builder.Jenkins.get_plugins_info', mock.MagicMock)
+class TestConfigs(CmdTestsBase):
+
+    def test_use_global_config(self):
+        """
+        Verify that JJB uses the global config file by default
+        """
+        args = self.parser.parse_args(['test', 'foo'])
+        self.assertEqual(cmd.get_config_file(args),
+                         '/etc/jenkins_jobs/jenkins_jobs.ini')
+
+    def test_use_config_in_user_home(self):
+        """
+        Verify that JJB uses config file in user home folder
+        """
+        args = self.parser.parse_args(['test', 'foo'])
+        # args.output_dir = mock.MagicMock()
+        # mock_isfile.side_effect = True
+        expected_loc = os.path.join(os.path.expanduser('~'), '.config',
+                                    'jenkins_jobs', 'jenkins_jobs.ini')
+        with patch('os.path.isfile', return_value=True):
+            self.assertEqual(cmd.get_config_file(args), expected_loc)
+
+
 @mock.patch('jenkins_jobs.builder.Jenkins.get_plugins_info', mock.MagicMock)
 class TestTests(CmdTestsBase):