diff --git a/homeassistant/components/hvac/__init__.py b/homeassistant/components/hvac/__init__.py
index c57cb4e23ff..ca5673aafb8 100644
--- a/homeassistant/components/hvac/__init__.py
+++ b/homeassistant/components/hvac/__init__.py
@@ -468,12 +468,12 @@ class HvacDevice(Entity):
     @property
     def min_temp(self):
         """Return the minimum temperature."""
-        return convert(7, TEMP_CELCIUS, self.unit_of_measurement)
+        return convert(19, TEMP_CELCIUS, self.unit_of_measurement)
 
     @property
     def max_temp(self):
         """Return the maximum temperature."""
-        return convert(35, TEMP_CELCIUS, self.unit_of_measurement)
+        return convert(30, TEMP_CELCIUS, self.unit_of_measurement)
 
     @property
     def min_humidity(self):
diff --git a/homeassistant/components/hvac/zwave.py b/homeassistant/components/hvac/zwave.py
index a170d3a9e79..e1b1614a60f 100755
--- a/homeassistant/components/hvac/zwave.py
+++ b/homeassistant/components/hvac/zwave.py
@@ -233,13 +233,3 @@ class ZWaveHvac(ZWaveDeviceEntity, HvacDevice):
                     class_id=COMMAND_CLASS_CONFIGURATION).values():
                 if value.command_class == 112 and value.index == 33:
                     value.data = int(swing_mode)
-
-    @property
-    def min_temp(self):
-        """Return the minimum temperature."""
-        return self._convert_for_display(19)
-
-    @property
-    def max_temp(self):
-        """Return the maximum temperature."""
-        return self._convert_for_display(30)
diff --git a/tests/components/hvac/test_demo.py b/tests/components/hvac/test_demo.py
index 0a9a1fdd99d..bdb155e43b4 100644
--- a/tests/components/hvac/test_demo.py
+++ b/tests/components/hvac/test_demo.py
@@ -43,8 +43,8 @@ class TestDemoHvac(unittest.TestCase):
     def test_default_setup_params(self):
         """Test the setup with default parameters."""
         state = self.hass.states.get(ENTITY_HVAC)
-        self.assertEqual(7, state.attributes.get('min_temp'))
-        self.assertEqual(35, state.attributes.get('max_temp'))
+        self.assertEqual(19, state.attributes.get('min_temp'))
+        self.assertEqual(30, state.attributes.get('max_temp'))
         self.assertEqual(30, state.attributes.get('min_humidity'))
         self.assertEqual(99, state.attributes.get('max_humidity'))