diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py
index 579d4b40003..25754d32ead 100644
--- a/homeassistant/components/automation/__init__.py
+++ b/homeassistant/components/automation/__init__.py
@@ -31,6 +31,8 @@ ENTITY_ID_FORMAT = DOMAIN + '.{}'
 
 DEPENDENCIES = ['group']
 
+GROUP_NAME_ALL_AUTOMATIONS = 'all automations'
+
 CONF_ALIAS = 'alias'
 CONF_HIDE_ENTITY = 'hide_entity'
 
@@ -139,7 +141,8 @@ def reload(hass):
 
 def setup(hass, config):
     """Setup the automation."""
-    component = EntityComponent(_LOGGER, DOMAIN, hass)
+    component = EntityComponent(_LOGGER, DOMAIN, hass,
+                                group_name=GROUP_NAME_ALL_AUTOMATIONS)
 
     success = run_coroutine_threadsafe(
         _async_process_config(hass, config, component), hass.loop).result()
diff --git a/homeassistant/components/script.py b/homeassistant/components/script.py
index 961c37f896a..dfaa6b250b0 100644
--- a/homeassistant/components/script.py
+++ b/homeassistant/components/script.py
@@ -23,6 +23,7 @@ from homeassistant.helpers.script import Script
 
 DOMAIN = "script"
 ENTITY_ID_FORMAT = DOMAIN + '.{}'
+GROUP_NAME_ALL_SCRIPTS = 'all scripts'
 DEPENDENCIES = ["group"]
 
 CONF_SEQUENCE = "sequence"
@@ -73,7 +74,8 @@ def toggle(hass, entity_id):
 
 def setup(hass, config):
     """Load the scripts from the configuration."""
-    component = EntityComponent(_LOGGER, DOMAIN, hass)
+    component = EntityComponent(_LOGGER, DOMAIN, hass,
+                                group_name=GROUP_NAME_ALL_SCRIPTS)
 
     def service_handler(service):
         """Execute a service call to script.<script name>."""
diff --git a/tests/components/automation/test_init.py b/tests/components/automation/test_init.py
index 8cc7825bb1f..0feaaadc376 100644
--- a/tests/components/automation/test_init.py
+++ b/tests/components/automation/test_init.py
@@ -75,6 +75,10 @@ class TestAutomation(unittest.TestCase):
         assert state is not None
         assert state.attributes.get('last_triggered') == time
 
+        state = self.hass.states.get('group.all_automations')
+        assert state is not None
+        assert state.attributes.get('entity_id') == ('automation.hello',)
+
     def test_service_specify_entity_id(self):
         """Test service data."""
         assert setup_component(self.hass, automation.DOMAIN, {
diff --git a/tests/components/test_script.py b/tests/components/test_script.py
index 8b8a144b878..bbdcac22593 100644
--- a/tests/components/test_script.py
+++ b/tests/components/test_script.py
@@ -82,6 +82,10 @@ class TestScriptComponent(unittest.TestCase):
         self.hass.block_till_done()
         self.assertEqual(0, len(events))
 
+        state = self.hass.states.get('group.all_scripts')
+        assert state is not None
+        assert state.attributes.get('entity_id') == (ENTITY_ID,)
+
     def test_toggle_service(self):
         """Test the toggling of a service."""
         event = 'test_event'