diff --git a/homeassistant/components/zwave/light.py b/homeassistant/components/zwave/light.py
index a029fa35a65..ea2b34a874f 100644
--- a/homeassistant/components/zwave/light.py
+++ b/homeassistant/components/zwave/light.py
@@ -123,7 +123,7 @@ class ZwaveDimmer(ZWaveDeviceEntity, LightEntity):
         self._state = None
         self._color_mode = None
         self._supported_color_modes = set()
-        self._supported_features = None
+        self._supported_features = 0
         self._delay = delay
         self._refresh_value = refresh
         self._zw098 = None
diff --git a/tests/components/zwave/test_light.py b/tests/components/zwave/test_light.py
index 35128ccc69a..74c541f4d5a 100644
--- a/tests/components/zwave/test_light.py
+++ b/tests/components/zwave/test_light.py
@@ -39,7 +39,7 @@ def test_get_device_detects_dimmer(mock_openzwave):
     device = light.get_device(node=node, values=values, node_config={})
     assert isinstance(device, light.ZwaveDimmer)
     assert device.color_mode == COLOR_MODE_BRIGHTNESS
-    assert device.supported_features is None
+    assert device.supported_features == 0
     assert device.supported_color_modes == {COLOR_MODE_BRIGHTNESS}
 
 
@@ -52,7 +52,7 @@ def test_get_device_detects_colorlight(mock_openzwave):
     device = light.get_device(node=node, values=values, node_config={})
     assert isinstance(device, light.ZwaveColorLight)
     assert device.color_mode == COLOR_MODE_RGB
-    assert device.supported_features is None
+    assert device.supported_features == 0
     assert device.supported_color_modes == {COLOR_MODE_RGB}
 
 
@@ -68,7 +68,7 @@ def test_get_device_detects_zw098(mock_openzwave):
     device = light.get_device(node=node, values=values, node_config={})
     assert isinstance(device, light.ZwaveColorLight)
     assert device.color_mode == COLOR_MODE_RGB
-    assert device.supported_features is None
+    assert device.supported_features == 0
     assert device.supported_color_modes == {COLOR_MODE_COLOR_TEMP, COLOR_MODE_RGB}
 
 
@@ -84,7 +84,7 @@ def test_get_device_detects_rgbw_light(mock_openzwave):
     device.value_added()
     assert isinstance(device, light.ZwaveColorLight)
     assert device.color_mode == COLOR_MODE_RGBW
-    assert device.supported_features is None
+    assert device.supported_features == 0
     assert device.supported_color_modes == {COLOR_MODE_RGBW}