diff --git a/homeassistant/components/mqtt_statestream.py b/homeassistant/components/mqtt_statestream.py
index 76154e4ab58..2b68394b160 100644
--- a/homeassistant/components/mqtt_statestream.py
+++ b/homeassistant/components/mqtt_statestream.py
@@ -38,7 +38,7 @@ def async_setup(hass, config):
             return
         payload = new_state.state
 
-        topic = base_topic + entity_id.replace('.', '/')
+        topic = base_topic + entity_id.replace('.', '/') + '/state'
         hass.components.mqtt.async_publish(topic, payload, 1, True)
 
     async_track_state_change(hass, MATCH_ALL, _state_publisher)
diff --git a/tests/components/test_mqtt_statestream.py b/tests/components/test_mqtt_statestream.py
index 73e2dbd1ac4..cbd7838effe 100644
--- a/tests/components/test_mqtt_statestream.py
+++ b/tests/components/test_mqtt_statestream.py
@@ -59,7 +59,7 @@ class TestMqttStateStream(object):
         mock_state_change_event(self.hass, State(e_id, 'on'))
         self.hass.block_till_done()
 
-        # Make sure 'on' was published to pub/fake/entity
-        mock_pub.assert_called_with(self.hass, 'pub/fake/entity', 'on', 1,
-                                    True)
+        # Make sure 'on' was published to pub/fake/entity/state
+        mock_pub.assert_called_with(self.hass, 'pub/fake/entity/state',
+                                    'on', 1, True)
         assert mock_pub.called