diff --git a/.coveragerc b/.coveragerc
index f9e026fefda..06a106f1f66 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -178,7 +178,7 @@ omit =
     homeassistant/components/ecobee/notify.py
     homeassistant/components/ecobee/sensor.py
     homeassistant/components/ecobee/weather.py
-    homeassistant/components/econet/water_heater.py
+    homeassistant/components/econet/*
     homeassistant/components/ecovacs/*
     homeassistant/components/eddystone_temperature/sensor.py
     homeassistant/components/edimax/switch.py
diff --git a/homeassistant/components/econet/const.py b/homeassistant/components/econet/const.py
new file mode 100644
index 00000000000..88b1b851aa6
--- /dev/null
+++ b/homeassistant/components/econet/const.py
@@ -0,0 +1,5 @@
+"""Constants for Econet integration."""
+
+DOMAIN = "econet"
+SERVICE_ADD_VACATION = "add_vacation"
+SERVICE_DELETE_VACATION = "delete_vacation"
diff --git a/homeassistant/components/econet/services.yaml b/homeassistant/components/econet/services.yaml
index e69de29bb2d..9f489165c22 100644
--- a/homeassistant/components/econet/services.yaml
+++ b/homeassistant/components/econet/services.yaml
@@ -0,0 +1,19 @@
+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
+
+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/homeassistant/components/econet/water_heater.py b/homeassistant/components/econet/water_heater.py
index 35547c8878e..26ee7cb8bd4 100644
--- a/homeassistant/components/econet/water_heater.py
+++ b/homeassistant/components/econet/water_heater.py
@@ -6,7 +6,6 @@ from pyeconet.api import PyEcoNet
 import voluptuous as vol
 
 from homeassistant.components.water_heater import (
-    DOMAIN,
     PLATFORM_SCHEMA,
     STATE_ECO,
     STATE_ELECTRIC,
@@ -28,6 +27,8 @@ from homeassistant.const import (
 )
 import homeassistant.helpers.config_validation as cv
 
+from .const import DOMAIN, SERVICE_ADD_VACATION, SERVICE_DELETE_VACATION
+
 _LOGGER = logging.getLogger(__name__)
 
 ATTR_VACATION_START = "next_vacation_start_date"
@@ -41,9 +42,6 @@ ATTR_END_DATE = "end_date"
 
 SUPPORT_FLAGS_HEATER = SUPPORT_TARGET_TEMPERATURE | SUPPORT_OPERATION_MODE
 
-SERVICE_ADD_VACATION = "econet_add_vacation"
-SERVICE_DELETE_VACATION = "econet_delete_vacation"
-
 ADD_VACATION_SCHEMA = vol.Schema(
     {
         vol.Optional(ATTR_ENTITY_ID): cv.entity_ids,
diff --git a/homeassistant/components/water_heater/services.yaml b/homeassistant/components/water_heater/services.yaml
index 72a3f909fbb..7a26e5bc0d4 100644
--- a/homeassistant/components/water_heater/services.yaml
+++ b/homeassistant/components/water_heater/services.yaml
@@ -29,23 +29,3 @@ 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