diff --git a/homeassistant/components/automation/__init__.py b/homeassistant/components/automation/__init__.py
index fe443515e8a..6f5396afa15 100644
--- a/homeassistant/components/automation/__init__.py
+++ b/homeassistant/components/automation/__init__.py
@@ -150,6 +150,7 @@ def trigger(hass, entity_id=None):
 
 def setup(hass, config):
     """Setup the automation."""
+    # pylint: disable=too-many-locals
     component = EntityComponent(_LOGGER, DOMAIN, hass)
 
     success = False
diff --git a/homeassistant/components/automation/state.py b/homeassistant/components/automation/state.py
index c36466311a9..8e0eb5231a5 100644
--- a/homeassistant/components/automation/state.py
+++ b/homeassistant/components/automation/state.py
@@ -85,7 +85,7 @@ def trigger(hass, config, action):
     def remove():
         """Remove state listeners."""
         unsub()
-
+        # pylint: disable=not-callable
         if remove_state_for_cancel is not None:
             remove_state_for_cancel()