diff --git a/homeassistant/components/light/zwave.py b/homeassistant/components/light/zwave.py
index aa686701cf3..62c970badc1 100644
--- a/homeassistant/components/light/zwave.py
+++ b/homeassistant/components/light/zwave.py
@@ -11,11 +11,10 @@ https://home-assistant.io/components/light.zwave/
 from threading import Timer
 
 from homeassistant.const import STATE_ON, STATE_OFF
-from homeassistant.components.light import (Light, ATTR_BRIGHTNESS)
-from homeassistant.components.zwave import ZWaveDeviceEntity
-import homeassistant.components.zwave as zwave
-
-DOMAIN = "light"
+from homeassistant.components.light import Light, ATTR_BRIGHTNESS, DOMAIN
+from homeassistant.components.zwave import (
+    COMMAND_CLASS_SWITCH_MULTILEVEL, TYPE_BYTE, GENRE_USER, NETWORK,
+    ATTR_NODE_ID, ATTR_VALUE_ID, ZWaveDeviceEntity)
 
 
 def setup_platform(hass, config, add_devices, discovery_info=None):
@@ -23,14 +22,14 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if discovery_info is None:
         return
 
-    node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]]
-    value = node.values[discovery_info[zwave.ATTR_VALUE_ID]]
+    node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]]
+    value = node.values[discovery_info[ATTR_VALUE_ID]]
 
-    if value.command_class != zwave.COMMAND_CLASS_SWITCH_MULTILEVEL:
+    if value.command_class != COMMAND_CLASS_SWITCH_MULTILEVEL:
         return
-    if value.type != zwave.TYPE_BYTE:
+    if value.type != TYPE_BYTE:
         return
-    if value.genre != zwave.GENRE_USER:
+    if value.genre != GENRE_USER:
         return
 
     value.set_change_verified(False)
diff --git a/homeassistant/components/sensor/zwave.py b/homeassistant/components/sensor/zwave.py
index 4c8ffb667c2..f28daa5b9e4 100644
--- a/homeassistant/components/sensor/zwave.py
+++ b/homeassistant/components/sensor/zwave.py
@@ -12,15 +12,16 @@ import datetime
 
 from homeassistant.helpers.event import track_point_in_time
 import homeassistant.util.dt as dt_util
-import homeassistant.components.zwave as zwave
-from homeassistant.components.zwave import ZWaveDeviceEntity
+from homeassistant.components.sensor import DOMAIN
 from homeassistant.helpers.entity import Entity
+from homeassistant.components.zwave import (
+    NETWORK, ATTR_NODE_ID, ATTR_VALUE_ID, COMMAND_CLASS_SENSOR_BINARY,
+    COMMAND_CLASS_SENSOR_MULTILEVEL, COMMAND_CLASS_METER, TYPE_DECIMAL,
+    COMMAND_CLASS_ALARM, ZWaveDeviceEntity, get_config_value)
 
 from homeassistant.const import (
     STATE_ON, STATE_OFF, TEMP_CELCIUS, TEMP_FAHRENHEIT)
 
-DOMAIN = "sensor"
-
 PHILIO = '013c'
 PHILIO_SLIM_SENSOR = '0002'
 PHILIO_SLIM_SENSOR_MOTION = (PHILIO, PHILIO_SLIM_SENSOR, 0)
@@ -44,14 +45,14 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if discovery_info is None:
         return
 
-    node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]]
-    value = node.values[discovery_info[zwave.ATTR_VALUE_ID]]
+    node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]]
+    value = node.values[discovery_info[ATTR_VALUE_ID]]
 
     value.set_change_verified(False)
 
-    # if 1 in groups and (zwave.NETWORK.controller.node_id not in
+    # if 1 in groups and (NETWORK.controller.node_id not in
     #                     groups[1].associations):
-    #     node.groups[1].add_association(zwave.NETWORK.controller.node_id)
+    #     node.groups[1].add_association(NETWORK.controller.node_id)
 
     specific_sensor_key = (value.node.manufacturer_id,
                            value.node.product_id,
@@ -61,23 +62,23 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if specific_sensor_key in DEVICE_MAPPINGS:
         if DEVICE_MAPPINGS[specific_sensor_key] == WORKAROUND_NO_OFF_EVENT:
             # Default the multiplier to 4
-            re_arm_multiplier = (zwave.get_config_value(value.node, 9) or 4)
+            re_arm_multiplier = (get_config_value(value.node, 9) or 4)
             add_devices([
                 ZWaveTriggerSensor(value, hass, re_arm_multiplier * 8)
             ])
 
     # generic Device mappings
-    elif value.command_class == zwave.COMMAND_CLASS_SENSOR_BINARY:
+    elif value.command_class == COMMAND_CLASS_SENSOR_BINARY:
         add_devices([ZWaveBinarySensor(value)])
 
-    elif value.command_class == zwave.COMMAND_CLASS_SENSOR_MULTILEVEL:
+    elif value.command_class == COMMAND_CLASS_SENSOR_MULTILEVEL:
         add_devices([ZWaveMultilevelSensor(value)])
 
-    elif (value.command_class == zwave.COMMAND_CLASS_METER and
-          value.type == zwave.TYPE_DECIMAL):
+    elif (value.command_class == COMMAND_CLASS_METER and
+          value.type == TYPE_DECIMAL):
         add_devices([ZWaveMultilevelSensor(value)])
 
-    elif value.command_class == zwave.COMMAND_CLASS_ALARM:
+    elif value.command_class == COMMAND_CLASS_ALARM:
         add_devices([ZWaveAlarmSensor(value)])
 
 
diff --git a/homeassistant/components/switch/zwave.py b/homeassistant/components/switch/zwave.py
index d3a268b165f..97254ed702f 100644
--- a/homeassistant/components/switch/zwave.py
+++ b/homeassistant/components/switch/zwave.py
@@ -6,12 +6,10 @@ Zwave platform that handles simple binary switches.
 """
 # Because we do not compile openzwave on CI
 # pylint: disable=import-error
-import homeassistant.components.zwave as zwave
-
-from homeassistant.components.switch import SwitchDevice
-from homeassistant.components.zwave import ZWaveDeviceEntity
-
-DOMAIN = "switch"
+from homeassistant.components.switch import SwitchDevice, DOMAIN
+from homeassistant.components.zwave import (
+    COMMAND_CLASS_SWITCH_BINARY, TYPE_BOOL, GENRE_USER, NETWORK,
+    ATTR_NODE_ID, ATTR_VALUE_ID, ZWaveDeviceEntity)
 
 
 # pylint: disable=unused-argument
@@ -20,14 +18,14 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
     if discovery_info is None:
         return
 
-    node = zwave.NETWORK.nodes[discovery_info[zwave.ATTR_NODE_ID]]
-    value = node.values[discovery_info[zwave.ATTR_VALUE_ID]]
+    node = NETWORK.nodes[discovery_info[ATTR_NODE_ID]]
+    value = node.values[discovery_info[ATTR_VALUE_ID]]
 
-    if value.command_class != zwave.COMMAND_CLASS_SWITCH_BINARY:
+    if value.command_class != COMMAND_CLASS_SWITCH_BINARY:
         return
-    if value.type != zwave.TYPE_BOOL:
+    if value.type != TYPE_BOOL:
         return
-    if value.genre != zwave.GENRE_USER:
+    if value.genre != GENRE_USER:
         return
 
     value.set_change_verified(False)