diff --git a/homeassistant/components/google_assistant/trait.py b/homeassistant/components/google_assistant/trait.py
index e0776d4c636615..3a46f529c353ef 100644
--- a/homeassistant/components/google_assistant/trait.py
+++ b/homeassistant/components/google_assistant/trait.py
@@ -517,7 +517,10 @@ class TemperatureSettingTrait(_Trait):
         climate.STATE_HEAT: 'heat',
         climate.STATE_COOL: 'cool',
         climate.STATE_OFF: 'off',
-        climate.STATE_AUTO: 'heatcool',
+        climate.STATE_AUTO: 'auto',
+        climate.STATE_FAN_ONLY: 'fan-only',
+        climate.STATE_DRY: 'dry',
+        climate.STATE_ECO: 'eco'
     }
     google_to_hass = {value: key for key, value in hass_to_google.items()}
 
diff --git a/tests/components/google_assistant/__init__.py b/tests/components/google_assistant/__init__.py
index 03cc327a5c51f7..949960598d64d6 100644
--- a/tests/components/google_assistant/__init__.py
+++ b/tests/components/google_assistant/__init__.py
@@ -223,7 +223,7 @@
     'type': 'action.devices.types.THERMOSTAT',
     'willReportState': False,
     'attributes': {
-        'availableThermostatModes': 'heat,cool,heatcool,off',
+        'availableThermostatModes': 'heat,cool,auto,off',
         'thermostatTemperatureUnit': 'C',
     },
 }, {
diff --git a/tests/components/google_assistant/test_google_assistant.py b/tests/components/google_assistant/test_google_assistant.py
index 89e9090da98a78..0da2781a01f092 100644
--- a/tests/components/google_assistant/test_google_assistant.py
+++ b/tests/components/google_assistant/test_google_assistant.py
@@ -214,7 +214,7 @@ def test_query_climate_request(hass_fixture, assistant_client, auth_header):
         'online': True,
         'thermostatTemperatureSetpointHigh': 24,
         'thermostatTemperatureAmbient': 23,
-        'thermostatMode': 'heatcool',
+        'thermostatMode': 'auto',
         'thermostatTemperatureSetpointLow': 21
     }
     assert devices['climate.hvac'] == {
@@ -271,7 +271,7 @@ def test_query_climate_request_f(hass_fixture, assistant_client, auth_header):
         'online': True,
         'thermostatTemperatureSetpointHigh': -4.4,
         'thermostatTemperatureAmbient': -5,
-        'thermostatMode': 'heatcool',
+        'thermostatMode': 'auto',
         'thermostatTemperatureSetpointLow': -6.1,
     }
     assert devices['climate.hvac'] == {
diff --git a/tests/components/google_assistant/test_trait.py b/tests/components/google_assistant/test_trait.py
index e9169c9bbbe16a..cb709ed084c7d2 100644
--- a/tests/components/google_assistant/test_trait.py
+++ b/tests/components/google_assistant/test_trait.py
@@ -679,11 +679,11 @@ async def test_temperature_setting_climate_range(hass):
             climate.ATTR_MAX_TEMP: 80
         }), BASIC_CONFIG)
     assert trt.sync_attributes() == {
-        'availableThermostatModes': 'off,cool,heat,heatcool',
+        'availableThermostatModes': 'off,cool,heat,auto',
         'thermostatTemperatureUnit': 'F',
     }
     assert trt.query_attributes() == {
-        'thermostatMode': 'heatcool',
+        'thermostatMode': 'auto',
         'thermostatTemperatureAmbient': 21.1,
         'thermostatHumidityAmbient': 25,
         'thermostatTemperatureSetpointLow': 18.3,
@@ -709,7 +709,7 @@ async def test_temperature_setting_climate_range(hass):
     calls = async_mock_service(
         hass, climate.DOMAIN, climate.SERVICE_SET_OPERATION_MODE)
     await trt.execute(trait.COMMAND_THERMOSTAT_SET_MODE, {
-        'thermostatMode': 'heatcool',
+        'thermostatMode': 'auto',
     })
     assert len(calls) == 1
     assert calls[0].data == {