diff --git a/homeassistant/components/demo.py b/homeassistant/components/demo.py
index 3f3454e0f02..80f89d7c134 100644
--- a/homeassistant/components/demo.py
+++ b/homeassistant/components/demo.py
@@ -86,16 +86,11 @@ def setup(hass, config):
     group.Group.create_group(hass, 'people', [
         'device_tracker.demo_anne_therese', 'device_tracker.demo_home_boy',
         'device_tracker.demo_paulus'])
-    group.Group.create_group(hass, 'thermostats', [
-        'thermostat.nest', 'thermostat.thermostat'])
     group.Group.create_group(hass, 'downstairs', [
         'group.living_room', 'group.kitchen',
         'scene.romantic_lights', 'rollershutter.kitchen_window',
         'rollershutter.living_room_window', 'group.doors',
-        'thermostat.nest',
-    ], view=True)
-    group.Group.create_group(hass, 'Upstairs', [
-        'thermostat.thermostat', 'group.bedroom',
+        'thermostat.ecobee',
     ], view=True)
 
     # Setup scripts