diff --git a/.coveragerc b/.coveragerc
index df73e2066b7..fd40e588bf7 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -434,7 +434,6 @@ omit =
     homeassistant/components/camera/xeoma.py
     homeassistant/components/camera/xiaomi.py
     homeassistant/components/camera/yi.py
-    homeassistant/components/climate/econet.py
     homeassistant/components/climate/ephember.py
     homeassistant/components/climate/eq3btsmart.py
     homeassistant/components/climate/flexit.py
@@ -844,6 +843,7 @@ omit =
     homeassistant/components/tts/picotts.py
     homeassistant/components/vacuum/mqtt.py
     homeassistant/components/vacuum/roomba.py
+    homeassistant/components/water_heater/econet.py
     homeassistant/components/watson_iot.py
     homeassistant/components/weather/bom.py
     homeassistant/components/weather/buienradar.py
diff --git a/homeassistant/components/climate/services.yaml b/homeassistant/components/climate/services.yaml
index fbb21962c6e..e2a42770cb2 100644
--- a/homeassistant/components/climate/services.yaml
+++ b/homeassistant/components/climate/services.yaml
@@ -123,26 +123,6 @@ nuheat_resume_program:
       description: Name(s) of entities to change.
       example: 'climate.kitchen'
 
-econet_add_vacation:
-  description: Add a vacation to your water heater.
-  fields:
-    entity_id:
-      description: Name(s) of entities to change.
-      example: 'climate.water_heater'
-    start_date:
-      description: The timestamp of when the vacation should start. (Optional, defaults to now)
-      example: 1513186320
-    end_date:
-      description: The timestamp of when the vacation should end.
-      example: 1513445520
-
-econet_delete_vacation:
-  description: Delete your existing vacation from your water heater.
-  fields:
-    entity_id:
-      description: Name(s) of entities to change.
-      example: 'climate.water_heater'
-
 sensibo_assume_state:
   description: Set Sensibo device to external state.
   fields:
diff --git a/homeassistant/components/climate/econet.py b/homeassistant/components/water_heater/econet.py
similarity index 96%
rename from homeassistant/components/climate/econet.py
rename to homeassistant/components/water_heater/econet.py
index 8be640c37e1..6af8ea43fa6 100644
--- a/homeassistant/components/climate/econet.py
+++ b/homeassistant/components/water_heater/econet.py
@@ -2,17 +2,17 @@
 Support for Rheem EcoNet water heaters.
 
 For more details about this platform, please refer to the documentation at
-https://home-assistant.io/components/climate.econet/
+https://home-assistant.io/components/water_heater.econet/
 """
 import datetime
 import logging
 
 import voluptuous as vol
 
-from homeassistant.components.climate import (
+from homeassistant.components.water_heater import (
     DOMAIN, PLATFORM_SCHEMA, STATE_ECO, STATE_ELECTRIC, STATE_GAS,
     STATE_HEAT_PUMP, STATE_HIGH_DEMAND, STATE_OFF, STATE_PERFORMANCE,
-    SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, ClimateDevice)
+    SUPPORT_OPERATION_MODE, SUPPORT_TARGET_TEMPERATURE, WaterHeaterDevice)
 from homeassistant.const import (
     ATTR_ENTITY_ID, ATTR_TEMPERATURE, CONF_PASSWORD, CONF_USERNAME,
     TEMP_FAHRENHEIT)
@@ -109,7 +109,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                            schema=DELETE_VACATION_SCHEMA)
 
 
-class EcoNetWaterHeater(ClimateDevice):
+class EcoNetWaterHeater(WaterHeaterDevice):
     """Representation of an EcoNet water heater."""
 
     def __init__(self, water_heater):
diff --git a/homeassistant/components/water_heater/services.yaml b/homeassistant/components/water_heater/services.yaml
index 959d1ca9790..72a3f909fbb 100644
--- a/homeassistant/components/water_heater/services.yaml
+++ b/homeassistant/components/water_heater/services.yaml
@@ -9,6 +9,7 @@ set_away_mode:
     away_mode:
       description: New value of away mode.
       example: true
+
 set_temperature:
   description: Set target temperature of water_heater device.
   fields:
@@ -18,6 +19,7 @@ set_temperature:
     temperature:
       description: New target temperature for water heater.
       example: 25
+
 set_operation_mode:
   description: Set operation mode for water_heater device.
   fields:
@@ -27,3 +29,23 @@ set_operation_mode:
     operation_mode:
       description: New value of operation mode.
       example: eco
+
+econet_add_vacation:
+  description: Add a vacation to your water heater.
+  fields:
+    entity_id:
+      description: Name(s) of entities to change.
+      example: 'water_heater.econet'
+    start_date:
+      description: The timestamp of when the vacation should start. (Optional, defaults to now)
+      example: 1513186320
+    end_date:
+      description: The timestamp of when the vacation should end.
+      example: 1513445520
+
+econet_delete_vacation:
+  description: Delete your existing vacation from your water heater.
+  fields:
+    entity_id:
+      description: Name(s) of entities to change.
+      example: 'water_heater.econet'
\ No newline at end of file
diff --git a/requirements_all.txt b/requirements_all.txt
index e278a012acb..fe5d467062e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -857,7 +857,7 @@ pydukeenergy==0.0.6
 # homeassistant.components.sensor.ebox
 pyebox==1.1.4
 
-# homeassistant.components.climate.econet
+# homeassistant.components.water_heater.econet
 pyeconet==0.0.6
 
 # homeassistant.components.switch.edimax