diff --git a/homeassistant/helpers/state.py b/homeassistant/helpers/state.py
index c9addefec2b..c8b489a9532 100644
--- a/homeassistant/helpers/state.py
+++ b/homeassistant/helpers/state.py
@@ -14,15 +14,14 @@ from homeassistant.components.sun import (
     STATE_ABOVE_HORIZON, STATE_BELOW_HORIZON)
 from homeassistant.components.switch.mysensors import (
     ATTR_IR_CODE, SERVICE_SEND_IR_CODE)
-from homeassistant.components.thermostat import (
-    ATTR_AWAY_MODE, ATTR_FAN, SERVICE_SET_AWAY_MODE, SERVICE_SET_FAN_MODE,
+from homeassistant.components.climate import (
+    ATTR_AUX_HEAT, ATTR_AWAY_MODE, ATTR_FAN_MODE, ATTR_HUMIDITY,
+    ATTR_OPERATION_MODE, ATTR_SWING_MODE,
+    SERVICE_SET_AUX_HEAT, SERVICE_SET_AWAY_MODE, SERVICE_SET_FAN_MODE,
+    SERVICE_SET_HUMIDITY, SERVICE_SET_OPERATION_MODE, SERVICE_SET_SWING_MODE,
     SERVICE_SET_TEMPERATURE)
-from homeassistant.components.thermostat.ecobee import (
+from homeassistant.components.climate.ecobee import (
     ATTR_FAN_MIN_ON_TIME, SERVICE_SET_FAN_MIN_ON_TIME)
-from homeassistant.components.hvac import (
-    ATTR_HUMIDITY, ATTR_SWING_MODE, ATTR_OPERATION_MODE, ATTR_AUX_HEAT,
-    SERVICE_SET_HUMIDITY, SERVICE_SET_SWING_MODE,
-    SERVICE_SET_OPERATION_MODE, SERVICE_SET_AUX_HEAT)
 from homeassistant.const import (
     ATTR_ENTITY_ID, ATTR_TEMPERATURE, SERVICE_ALARM_ARM_AWAY,
     SERVICE_ALARM_ARM_HOME, SERVICE_ALARM_DISARM, SERVICE_ALARM_TRIGGER,
@@ -49,7 +48,7 @@ SERVICE_ATTRIBUTES = {
     SERVICE_VOLUME_SET: [ATTR_MEDIA_VOLUME_LEVEL],
     SERVICE_NOTIFY: [ATTR_MESSAGE],
     SERVICE_SET_AWAY_MODE: [ATTR_AWAY_MODE],
-    SERVICE_SET_FAN_MODE: [ATTR_FAN],
+    SERVICE_SET_FAN_MODE: [ATTR_FAN_MODE],
     SERVICE_SET_FAN_MIN_ON_TIME: [ATTR_FAN_MIN_ON_TIME],
     SERVICE_SET_TEMPERATURE: [ATTR_TEMPERATURE],
     SERVICE_SET_HUMIDITY: [ATTR_HUMIDITY],