diff --git a/homeassistant/components/mysensors.py b/homeassistant/components/mysensors.py
index 7fb1a7cb1d7..97c2329656b 100644
--- a/homeassistant/components/mysensors.py
+++ b/homeassistant/components/mysensors.py
@@ -72,8 +72,6 @@ DISCOVERY_COMPONENTS = [
 
 def setup(hass, config):
     """Setup the MySensors component."""
-    # pylint: disable=too-many-locals
-
     if not validate_config(config,
                            {DOMAIN: [CONF_GATEWAYS]},
                            _LOGGER):
diff --git a/homeassistant/components/sensor/mysensors.py b/homeassistant/components/sensor/mysensors.py
index 3562af1949d..a3d5da11cbb 100644
--- a/homeassistant/components/sensor/mysensors.py
+++ b/homeassistant/components/sensor/mysensors.py
@@ -33,6 +33,9 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
         # Define the S_TYPES and V_TYPES that the platform should handle as
         # states.
         s_types = [
+            gateway.const.Presentation.S_DOOR,
+            gateway.const.Presentation.S_MOTION,
+            gateway.const.Presentation.S_SMOKE,
             gateway.const.Presentation.S_TEMP,
             gateway.const.Presentation.S_HUM,
             gateway.const.Presentation.S_BARO,
@@ -59,6 +62,11 @@ def setup_platform(hass, config, add_devices, discovery_info=None):
             s_types.extend([
                 gateway.const.Presentation.S_COLOR_SENSOR,
                 gateway.const.Presentation.S_MULTIMETER,
+                gateway.const.Presentation.S_SPRINKLER,
+                gateway.const.Presentation.S_WATER_LEAK,
+                gateway.const.Presentation.S_SOUND,
+                gateway.const.Presentation.S_VIBRATION,
+                gateway.const.Presentation.S_MOISTURE,
             ])
             not_v_types.extend([gateway.const.SetReq.V_STATUS, ])
         v_types = [member for member in gateway.const.SetReq