diff --git a/homeassistant/components/group.py b/homeassistant/components/group.py
index 7c24c505add..6975db4c46c 100644
--- a/homeassistant/components/group.py
+++ b/homeassistant/components/group.py
@@ -103,6 +103,8 @@ def get_entity_ids(hass, entity_id, domain_filter=None):
 def setup(hass, config):
     """ Sets up all groups found definded in the configuration. """
     for name, entity_ids in config.get(DOMAIN, {}).items():
+        if isinstance(entity_ids, str):
+            entity_ids = entity_ids.split(",")
         setup_group(hass, name, entity_ids)
 
     return True
diff --git a/tests/components/test_group.py b/tests/components/test_group.py
index d1e62b02cdb..22256057d7a 100644
--- a/tests/components/test_group.py
+++ b/tests/components/test_group.py
@@ -199,7 +199,7 @@ class TestComponentsGroup(unittest.TestCase):
                 self.hass,
                 {
                     group.DOMAIN: {
-                        'second_group': (self.group_entity_id, 'light.Bowl')
+                        'second_group': self.group_entity_id + ',light.Bowl'
                     }
                 }))