diff --git a/homeassistant/core.py b/homeassistant/core.py
index 1ef0adc5961..83056d6d7f2 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -1088,6 +1088,7 @@ class Config(object):
             'location_name': self.location_name,
             'time_zone': time_zone.zone,
             'components': self.components,
+            'config_dir': self.config_dir,
             'version': __version__
         }
 
diff --git a/tests/test_core.py b/tests/test_core.py
index 9fa742985c4..80a8c6d4c5f 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -448,6 +448,7 @@ class TestConfig(unittest.TestCase):
 
     def test_as_dict(self):
         """Test as dict."""
+        self.config.config_dir = '/tmp/ha-config'
         expected = {
             'latitude': None,
             'longitude': None,
@@ -455,6 +456,7 @@ class TestConfig(unittest.TestCase):
             'location_name': None,
             'time_zone': 'UTC',
             'components': [],
+            'config_dir': '/tmp/ha-config',
             'version': __version__,
         }