diff --git a/homeassistant/components/plugwise/sensor.py b/homeassistant/components/plugwise/sensor.py
index 59e7858f947..73a3c386716 100644
--- a/homeassistant/components/plugwise/sensor.py
+++ b/homeassistant/components/plugwise/sensor.py
@@ -3,17 +3,9 @@
 import logging
 
 from homeassistant.components.sensor import (
-    DEVICE_CLASS_BATTERY,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_GAS,
-    DEVICE_CLASS_ILLUMINANCE,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_PRESSURE,
-    DEVICE_CLASS_TEMPERATURE,
-    STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_TOTAL,
-    STATE_CLASS_TOTAL_INCREASING,
+    SensorDeviceClass,
     SensorEntity,
+    SensorStateClass,
 )
 from homeassistant.const import (
     ENERGY_KILO_WATT_HOUR,
@@ -46,26 +38,26 @@ _LOGGER = logging.getLogger(__name__)
 ATTR_TEMPERATURE = [
     "Temperature",
     TEMP_CELSIUS,
-    DEVICE_CLASS_TEMPERATURE,
-    STATE_CLASS_MEASUREMENT,
+    SensorDeviceClass.TEMPERATURE,
+    SensorStateClass.MEASUREMENT,
 ]
 ATTR_BATTERY_LEVEL = [
     "Charge",
     PERCENTAGE,
-    DEVICE_CLASS_BATTERY,
-    STATE_CLASS_MEASUREMENT,
+    SensorDeviceClass.BATTERY,
+    SensorStateClass.MEASUREMENT,
 ]
 ATTR_ILLUMINANCE = [
     "Illuminance",
     UNIT_LUMEN,
-    DEVICE_CLASS_ILLUMINANCE,
-    STATE_CLASS_MEASUREMENT,
+    SensorDeviceClass.ILLUMINANCE,
+    SensorStateClass.MEASUREMENT,
 ]
 ATTR_PRESSURE = [
     "Pressure",
     PRESSURE_BAR,
-    DEVICE_CLASS_PRESSURE,
-    STATE_CLASS_MEASUREMENT,
+    SensorDeviceClass.PRESSURE,
+    SensorStateClass.MEASUREMENT,
 ]
 
 TEMP_SENSOR_MAP = {
@@ -82,122 +74,122 @@ ENERGY_SENSOR_MAP = {
     "electricity_consumed": [
         "Current Consumed Power",
         POWER_WATT,
-        DEVICE_CLASS_POWER,
-        STATE_CLASS_MEASUREMENT,
+        SensorDeviceClass.POWER,
+        SensorStateClass.MEASUREMENT,
     ],
     "electricity_produced": [
         "Current Produced Power",
         POWER_WATT,
-        DEVICE_CLASS_POWER,
-        STATE_CLASS_MEASUREMENT,
+        SensorDeviceClass.POWER,
+        SensorStateClass.MEASUREMENT,
     ],
     "electricity_consumed_interval": [
         "Consumed Power Interval",
         ENERGY_WATT_HOUR,
-        DEVICE_CLASS_ENERGY,
-        STATE_CLASS_TOTAL,
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL,
     ],
     "electricity_consumed_peak_interval": [
         "Consumed Power Interval",
         ENERGY_WATT_HOUR,
-        DEVICE_CLASS_ENERGY,
-        STATE_CLASS_TOTAL,
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL,
     ],
     "electricity_consumed_off_peak_interval": [
         "Consumed Power Interval (off peak)",
         ENERGY_WATT_HOUR,
-        DEVICE_CLASS_ENERGY,
-        STATE_CLASS_TOTAL,
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL,
     ],
     "electricity_produced_interval": [
         "Produced Power Interval",
         ENERGY_WATT_HOUR,
-        DEVICE_CLASS_ENERGY,
-        STATE_CLASS_TOTAL,
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL,
     ],
     "electricity_produced_peak_interval": [
         "Produced Power Interval",
         ENERGY_WATT_HOUR,
-        DEVICE_CLASS_ENERGY,
-        STATE_CLASS_TOTAL,
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL,
     ],
     "electricity_produced_off_peak_interval": [
         "Produced Power Interval (off peak)",
         ENERGY_WATT_HOUR,
-        DEVICE_CLASS_ENERGY,
-        STATE_CLASS_TOTAL,
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL,
     ],
     "electricity_consumed_off_peak_point": [
         "Current Consumed Power (off peak)",
         POWER_WATT,
-        DEVICE_CLASS_POWER,
-        STATE_CLASS_MEASUREMENT,
+        SensorDeviceClass.POWER,
+        SensorStateClass.MEASUREMENT,
     ],
     "electricity_consumed_peak_point": [
         "Current Consumed Power",
         POWER_WATT,
-        DEVICE_CLASS_POWER,
-        STATE_CLASS_MEASUREMENT,
+        SensorDeviceClass.POWER,
+        SensorStateClass.MEASUREMENT,
     ],
     "electricity_consumed_off_peak_cumulative": [
         "Cumulative Consumed Power (off peak)",
         ENERGY_KILO_WATT_HOUR,
-        DEVICE_CLASS_ENERGY,
-        STATE_CLASS_TOTAL_INCREASING,
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL_INCREASING,
     ],
     "electricity_consumed_peak_cumulative": [
         "Cumulative Consumed Power",
         ENERGY_KILO_WATT_HOUR,
-        DEVICE_CLASS_ENERGY,
-        STATE_CLASS_TOTAL_INCREASING,
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL_INCREASING,
     ],
     "electricity_produced_off_peak_point": [
         "Current Produced Power (off peak)",
         POWER_WATT,
-        DEVICE_CLASS_POWER,
-        STATE_CLASS_MEASUREMENT,
+        SensorDeviceClass.POWER,
+        SensorStateClass.MEASUREMENT,
     ],
     "electricity_produced_peak_point": [
         "Current Produced Power",
         POWER_WATT,
-        DEVICE_CLASS_POWER,
-        STATE_CLASS_MEASUREMENT,
+        SensorDeviceClass.POWER,
+        SensorStateClass.MEASUREMENT,
     ],
     "electricity_produced_off_peak_cumulative": [
         "Cumulative Produced Power (off peak)",
         ENERGY_KILO_WATT_HOUR,
-        DEVICE_CLASS_ENERGY,
-        STATE_CLASS_TOTAL_INCREASING,
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL_INCREASING,
     ],
     "electricity_produced_peak_cumulative": [
         "Cumulative Produced Power",
         ENERGY_KILO_WATT_HOUR,
-        DEVICE_CLASS_ENERGY,
-        STATE_CLASS_TOTAL_INCREASING,
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL_INCREASING,
     ],
     "gas_consumed_interval": [
         "Current Consumed Gas Interval",
         VOLUME_CUBIC_METERS,
-        DEVICE_CLASS_GAS,
-        STATE_CLASS_TOTAL,
+        SensorDeviceClass.GAS,
+        SensorStateClass.TOTAL,
     ],
     "gas_consumed_cumulative": [
         "Consumed Gas",
         VOLUME_CUBIC_METERS,
-        DEVICE_CLASS_GAS,
-        STATE_CLASS_TOTAL_INCREASING,
+        SensorDeviceClass.GAS,
+        SensorStateClass.TOTAL_INCREASING,
     ],
     "net_electricity_point": [
         "Current net Power",
         POWER_WATT,
-        DEVICE_CLASS_POWER,
-        STATE_CLASS_MEASUREMENT,
+        SensorDeviceClass.POWER,
+        SensorStateClass.MEASUREMENT,
     ],
     "net_electricity_cumulative": [
         "Cumulative net Power",
         ENERGY_KILO_WATT_HOUR,
-        DEVICE_CLASS_ENERGY,
-        STATE_CLASS_TOTAL,
+        SensorDeviceClass.ENERGY,
+        SensorStateClass.TOTAL,
     ],
 }
 
@@ -208,9 +200,14 @@ MISC_SENSOR_MAP = {
         "Heater Modulation Level",
         PERCENTAGE,
         None,
-        STATE_CLASS_MEASUREMENT,
+        SensorStateClass.MEASUREMENT,
+    ],
+    "valve_position": [
+        "Valve Position",
+        PERCENTAGE,
+        None,
+        SensorStateClass.MEASUREMENT,
     ],
-    "valve_position": ["Valve Position", PERCENTAGE, None, STATE_CLASS_MEASUREMENT],
     "water_pressure": ATTR_PRESSURE,
 }