diff --git a/homeassistant/components/input_boolean.py b/homeassistant/components/input_boolean.py
index 27216782ba1..f86fffcaeb6 100644
--- a/homeassistant/components/input_boolean.py
+++ b/homeassistant/components/input_boolean.py
@@ -65,8 +65,6 @@ def setup(hass, config):
     if not entities:
         return False
 
-    component.add_entities(entities)
-
     def toggle_service(service):
         """Handle a calls to the input boolean services."""
         target_inputs = component.extract_from_service(service)
@@ -80,6 +78,8 @@ def setup(hass, config):
     hass.services.register(DOMAIN, SERVICE_TURN_OFF, toggle_service)
     hass.services.register(DOMAIN, SERVICE_TURN_ON, toggle_service)
 
+    component.add_entities(entities)
+
     return True
 
 
diff --git a/tests/components/test_input_boolean.py b/tests/components/test_input_boolean.py
index a7366d91fd3..ace91018ccd 100644
--- a/tests/components/test_input_boolean.py
+++ b/tests/components/test_input_boolean.py
@@ -26,14 +26,18 @@ class TestInputBoolean(unittest.TestCase):
 
     def test_config(self):
         """Test config."""
+        self.assertFalse(input_boolean.setup(self.hass, {
+            'input_boolean': None
+        }))
+
         self.assertFalse(input_boolean.setup(self.hass, {
             'input_boolean': {
-                'test 1': None,
             }
         }))
 
         self.assertFalse(input_boolean.setup(self.hass, {
             'input_boolean': {
+                'name with space': None
             }
         }))