diff --git a/homeassistant/components/sensor/yweather.py b/homeassistant/components/sensor/yweather.py
index df18e086ddda82..db66419e54ab1d 100644
--- a/homeassistant/components/sensor/yweather.py
+++ b/homeassistant/components/sensor/yweather.py
@@ -131,9 +131,12 @@ def entity_picture(self):
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        return {
-            ATTR_ATTRIBUTION: CONF_ATTRIBUTION,
-        }
+        attrs = {ATTR_ATTRIBUTION: CONF_ATTRIBUTION}
+
+        if self._code is not None and "weather" in self._type:
+            attrs['condition_code'] = self._code
+
+        return attrs
 
     def update(self):
         """Get the latest data from Yahoo! and updates the states."""
diff --git a/tests/components/sensor/test_yweather.py b/tests/components/sensor/test_yweather.py
index 88b94906a35131..aeee47bfa807c8 100644
--- a/tests/components/sensor/test_yweather.py
+++ b/tests/components/sensor/test_yweather.py
@@ -162,6 +162,8 @@ def test_setup_all(self, mock_yahooweather):
         state = self.hass.states.get('sensor.yweather_condition')
         assert state is not None
         self.assertEqual(state.state, 'Mostly Cloudy')
+        self.assertEqual(state.attributes.get('condition_code'),
+                         '28')
         self.assertEqual(state.attributes.get('friendly_name'),
                          'Yweather Condition')