diff --git a/homeassistant/components/automation/numeric_state.py b/homeassistant/components/automation/numeric_state.py
index 10a14b179a8..a4cbce8182a 100644
--- a/homeassistant/components/automation/numeric_state.py
+++ b/homeassistant/components/automation/numeric_state.py
@@ -41,7 +41,7 @@ def trigger(hass, config, action):
     if value_template is not None:
         renderer = lambda value: template.render(hass,
                                                  value_template,
-                                                 {'value': value})
+                                                 {'state': value})
     else:
         renderer = lambda value: value.state
 
@@ -82,7 +82,7 @@ def if_action(hass, config):
     if value_template is not None:
         renderer = lambda value: template.render(hass,
                                                  value_template,
-                                                 {'value': value})
+                                                 {'state': value})
     else:
         renderer = lambda value: value.state
 
diff --git a/tests/components/automation/test_numeric_state.py b/tests/components/automation/test_numeric_state.py
index 9e0301168f2..49246e48117 100644
--- a/tests/components/automation/test_numeric_state.py
+++ b/tests/components/automation/test_numeric_state.py
@@ -295,7 +295,7 @@ class TestAutomationNumericState(unittest.TestCase):
                 'trigger': {
                     'platform': 'numeric_state',
                     'entity_id': 'test.entity',
-                    'value_template': '{{ value.attributes.test_attribute }}',
+                    'value_template': '{{ state.attributes.test_attribute }}',
                     'below': 10,
                 },
                 'action': {
@@ -314,7 +314,7 @@ class TestAutomationNumericState(unittest.TestCase):
                 'trigger': {
                     'platform': 'numeric_state',
                     'entity_id': 'test.entity',
-                    'value_template': '{{ value.attributes.test_attribute }}',
+                    'value_template': '{{ state.attributes.test_attribute }}',
                     'below': 10,
                 },
                 'action': {
@@ -333,7 +333,7 @@ class TestAutomationNumericState(unittest.TestCase):
                 'trigger': {
                     'platform': 'numeric_state',
                     'entity_id': 'test.entity',
-                    'value_template': '{{ value.attributes.test_attribute }}',
+                    'value_template': '{{ state.attributes.test_attribute }}',
                     'below': 10,
                 },
                 'action': {
@@ -352,7 +352,7 @@ class TestAutomationNumericState(unittest.TestCase):
                 'trigger': {
                     'platform': 'numeric_state',
                     'entity_id': 'test.entity',
-                    'value_template': '{{ value.attributes.test_attribute }}',
+                    'value_template': '{{ state.attributes.test_attribute }}',
                     'below': 10,
                 },
                 'action': {
@@ -371,7 +371,7 @@ class TestAutomationNumericState(unittest.TestCase):
                 'trigger': {
                     'platform': 'numeric_state',
                     'entity_id': 'test.entity',
-                    'value_template': '{{ value.attributes.test_attribute }}',
+                    'value_template': '{{ state.attributes.test_attribute }}',
                     'below': 10,
                 },
                 'action': {
@@ -390,7 +390,7 @@ class TestAutomationNumericState(unittest.TestCase):
                 'trigger': {
                     'platform': 'numeric_state',
                     'entity_id': 'test.entity',
-                    'value_template': '{{ value.attributes.test_attribute[2] }}',
+                    'value_template': '{{ state.attributes.test_attribute[2] }}',
                     'below': 10,
                 },
                 'action': {
@@ -409,7 +409,7 @@ class TestAutomationNumericState(unittest.TestCase):
                 'trigger': {
                     'platform': 'numeric_state',
                     'entity_id': 'test.entity',
-                    'value_template': '{{ value.attributes.test_attribute | multiply(10) }}',
+                    'value_template': '{{ state.attributes.test_attribute | multiply(10) }}',
                     'below': 10,
                 },
                 'action': {
@@ -428,7 +428,7 @@ class TestAutomationNumericState(unittest.TestCase):
                 'trigger': {
                     'platform': 'numeric_state',
                     'entity_id': 'test.entity',
-                    'value_template': '{{ value.attributes.test_attribute }}',
+                    'value_template': '{{ state.attributes.test_attribute }}',
                     'below': 10,
                 },
                 'action': {