diff --git a/homeassistant/components/demo.py b/homeassistant/components/demo.py
index 0570d20c262..81299479772 100644
--- a/homeassistant/components/demo.py
+++ b/homeassistant/components/demo.py
@@ -21,6 +21,7 @@ COMPONENTS_WITH_DEMO_PLATFORM = [
     'camera',
     'device_tracker',
     'garage_door',
+    'hvac',
     'light',
     'lock',
     'media_player',
diff --git a/homeassistant/components/hvac/__init__.py b/homeassistant/components/hvac/__init__.py
index d514db364b8..4d0f498a242 100644
--- a/homeassistant/components/hvac/__init__.py
+++ b/homeassistant/components/hvac/__init__.py
@@ -457,12 +457,12 @@ class HvacDevice(Entity):
     @property
     def min_temp(self):
         """Return the minimum temperature."""
-        return self._convert_for_display(7)
+        return convert(7, TEMP_CELCIUS, self.unit_of_measurement)
 
     @property
     def max_temp(self):
         """Return the maximum temperature."""
-        return self._convert_for_display(35)
+        return convert(35, TEMP_CELCIUS, self.unit_of_measurement)
 
     @property
     def min_humidity(self):