diff --git a/tests/components/google_assistant/test_trait.py b/tests/components/google_assistant/test_trait.py
index a396c1bc91d..e20f08f8702 100644
--- a/tests/components/google_assistant/test_trait.py
+++ b/tests/components/google_assistant/test_trait.py
@@ -2444,7 +2444,11 @@ async def test_openclose_cover_no_position(hass):
 
 @pytest.mark.parametrize(
     "device_class",
-    (cover.DEVICE_CLASS_DOOR, cover.DEVICE_CLASS_GARAGE, cover.DEVICE_CLASS_GATE),
+    (
+        cover.CoverDeviceClass.DOOR,
+        cover.CoverDeviceClass.GARAGE,
+        cover.CoverDeviceClass.GATE,
+    ),
 )
 async def test_openclose_cover_secure(hass, device_class):
     """Test OpenClose trait support for cover domain."""
@@ -2507,11 +2511,11 @@ async def test_openclose_cover_secure(hass, device_class):
 @pytest.mark.parametrize(
     "device_class",
     (
-        binary_sensor.DEVICE_CLASS_DOOR,
-        binary_sensor.DEVICE_CLASS_GARAGE_DOOR,
-        binary_sensor.DEVICE_CLASS_LOCK,
-        binary_sensor.DEVICE_CLASS_OPENING,
-        binary_sensor.DEVICE_CLASS_WINDOW,
+        binary_sensor.BinarySensorDeviceClass.DOOR,
+        binary_sensor.BinarySensorDeviceClass.GARAGE_DOOR,
+        binary_sensor.BinarySensorDeviceClass.LOCK,
+        binary_sensor.BinarySensorDeviceClass.OPENING,
+        binary_sensor.BinarySensorDeviceClass.WINDOW,
     ),
 )
 async def test_openclose_binary_sensor(hass, device_class):
@@ -2728,14 +2732,14 @@ async def test_media_player_mute(hass):
 async def test_temperature_control_sensor(hass):
     """Test TemperatureControl trait support for temperature sensor."""
     assert (
-        helpers.get_google_type(sensor.DOMAIN, sensor.DEVICE_CLASS_TEMPERATURE)
+        helpers.get_google_type(sensor.DOMAIN, sensor.SensorDeviceClass.TEMPERATURE)
         is not None
     )
     assert not trait.TemperatureControlTrait.supported(
-        sensor.DOMAIN, 0, sensor.DEVICE_CLASS_HUMIDITY, None
+        sensor.DOMAIN, 0, sensor.SensorDeviceClass.HUMIDITY, None
     )
     assert trait.TemperatureControlTrait.supported(
-        sensor.DOMAIN, 0, sensor.DEVICE_CLASS_TEMPERATURE, None
+        sensor.DOMAIN, 0, sensor.SensorDeviceClass.TEMPERATURE, None
     )
 
 
@@ -2755,7 +2759,9 @@ async def test_temperature_control_sensor_data(hass, unit_in, unit_out, state, a
     trt = trait.TemperatureControlTrait(
         hass,
         State(
-            "sensor.test", state, {ATTR_DEVICE_CLASS: sensor.DEVICE_CLASS_TEMPERATURE}
+            "sensor.test",
+            state,
+            {ATTR_DEVICE_CLASS: sensor.SensorDeviceClass.TEMPERATURE},
         ),
         BASIC_CONFIG,
     )
@@ -2779,13 +2785,14 @@ async def test_temperature_control_sensor_data(hass, unit_in, unit_out, state, a
 async def test_humidity_setting_sensor(hass):
     """Test HumiditySetting trait support for humidity sensor."""
     assert (
-        helpers.get_google_type(sensor.DOMAIN, sensor.DEVICE_CLASS_HUMIDITY) is not None
+        helpers.get_google_type(sensor.DOMAIN, sensor.SensorDeviceClass.HUMIDITY)
+        is not None
     )
     assert not trait.HumiditySettingTrait.supported(
-        sensor.DOMAIN, 0, sensor.DEVICE_CLASS_TEMPERATURE, None
+        sensor.DOMAIN, 0, sensor.SensorDeviceClass.TEMPERATURE, None
     )
     assert trait.HumiditySettingTrait.supported(
-        sensor.DOMAIN, 0, sensor.DEVICE_CLASS_HUMIDITY, None
+        sensor.DOMAIN, 0, sensor.SensorDeviceClass.HUMIDITY, None
     )
 
 
@@ -2796,7 +2803,9 @@ async def test_humidity_setting_sensor_data(hass, state, ambient):
     """Test HumiditySetting trait support for humidity sensor."""
     trt = trait.HumiditySettingTrait(
         hass,
-        State("sensor.test", state, {ATTR_DEVICE_CLASS: sensor.DEVICE_CLASS_HUMIDITY}),
+        State(
+            "sensor.test", state, {ATTR_DEVICE_CLASS: sensor.SensorDeviceClass.HUMIDITY}
+        ),
         BASIC_CONFIG,
     )
 
@@ -2983,7 +2992,7 @@ async def test_channel(hass):
     assert trait.ChannelTrait.supported(
         media_player.DOMAIN,
         media_player.SUPPORT_PLAY_MEDIA,
-        media_player.DEVICE_CLASS_TV,
+        media_player.MediaPlayerDeviceClass.TV,
         None,
     )
     assert (
@@ -3029,12 +3038,12 @@ async def test_channel(hass):
 async def test_sensorstate(hass):
     """Test SensorState trait support for sensor domain."""
     sensor_types = {
-        sensor.DEVICE_CLASS_AQI: ("AirQuality", "AQI"),
-        sensor.DEVICE_CLASS_CO: ("CarbonDioxideLevel", "PARTS_PER_MILLION"),
-        sensor.DEVICE_CLASS_CO2: ("CarbonMonoxideLevel", "PARTS_PER_MILLION"),
-        sensor.DEVICE_CLASS_PM25: ("PM2.5", "MICROGRAMS_PER_CUBIC_METER"),
-        sensor.DEVICE_CLASS_PM10: ("PM10", "MICROGRAMS_PER_CUBIC_METER"),
-        sensor.DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS: (
+        sensor.SensorDeviceClass.AQI: ("AirQuality", "AQI"),
+        sensor.SensorDeviceClass.CO: ("CarbonDioxideLevel", "PARTS_PER_MILLION"),
+        sensor.SensorDeviceClass.CO2: ("CarbonMonoxideLevel", "PARTS_PER_MILLION"),
+        sensor.SensorDeviceClass.PM25: ("PM2.5", "MICROGRAMS_PER_CUBIC_METER"),
+        sensor.SensorDeviceClass.PM10: ("PM10", "MICROGRAMS_PER_CUBIC_METER"),
+        sensor.SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS: (
             "VolatileOrganicCompounds",
             "PARTS_PER_MILLION",
         ),
@@ -3073,7 +3082,7 @@ async def test_sensorstate(hass):
     assert helpers.get_google_type(sensor.DOMAIN, None) is not None
     assert (
         trait.SensorStateTrait.supported(
-            sensor.DOMAIN, None, sensor.DEVICE_CLASS_MONETARY, None
+            sensor.DOMAIN, None, sensor.SensorDeviceClass.MONETARY, None
         )
         is False
     )