diff --git a/colab/utils/conf.py b/colab/utils/conf.py
index 5b4c80b..65aba93 100644
--- a/colab/utils/conf.py
+++ b/colab/utils/conf.py
@@ -54,7 +54,7 @@ def _load_py_file(py_path, path):
     return py_setting
 
 
-def load_py_settings():
+def load_py_settings(settings_dir='/etc/colab/settings.d'):
     settings_file = os.getenv('COLAB_SETTINGS', '/etc/colab/settings.py')
     settings_module = settings_file.split('.')[-2].split('/')[-1]
     py_path = "/".join(settings_file.split('/')[:-1])
@@ -67,8 +67,6 @@ def load_py_settings():
 
     py_settings = _load_py_file(settings_module, py_path)
 
-    # Read settings from settings.d
-    settings_dir = '/etc/colab/settings.d'
     logger.info('Settings directory: %s', settings_dir)
 
     if not os.path.exists(settings_dir):
diff --git a/colab/utils/tests/test_conf.py b/colab/utils/tests/test_conf.py
index 231c298..1eded43 100644
--- a/colab/utils/tests/test_conf.py
+++ b/colab/utils/tests/test_conf.py
@@ -43,9 +43,9 @@ class TestConf(TestCase):
     def test_load_py_settings_with_inaccessible_settings(self, mock):
         self.assertRaises(InaccessibleSettings, load_py_settings)
 
-    @patch('os.path.exists', side_effect=[True, False])
+    @patch('os.getenv', return_value='./tests/colab_settings.py')
     def test_load_py_settings_without_settings_d(self, mock):
-        py_settings = load_py_settings()
+        py_settings = load_py_settings('/path/fake/settings.d/test.py')
 
         self.assertIn('SOCIAL_NETWORK_ENABLED', py_settings)
         self.assertTrue(py_settings['SOCIAL_NETWORK_ENABLED'])
@@ -59,7 +59,7 @@ class TestConf(TestCase):
            side_effect=[{'SOCIAL_NETWORK_ENABLED': True, 'EMAIL_PORT': 25},
                         {'TEST': 'test'}])
     def test_load_py_settings_with_settings_d(self, mock_py, mock_listdir):
-        py_settings = load_py_settings()
+        py_settings = load_py_settings('./tests/settings.d/')
 
         self.assertIn('SOCIAL_NETWORK_ENABLED', py_settings)
         self.assertTrue(py_settings['SOCIAL_NETWORK_ENABLED'])
--
libgit2 0.21.2