diff --git a/docs/entities/sensors.rst b/docs/entities/sensors.rst
index e887402..ef10eb7 100644
--- a/docs/entities/sensors.rst
+++ b/docs/entities/sensors.rst
@@ -156,6 +156,8 @@ Optional Sensors
 -  For every optional temperature object available in
    [``temperature_sensor``, ``temperature_fan``, ``bme280``, ``htu21d``, ``lm75``]
    we will create a sensor showing sensor temperature.
+- For every ``heater_generic`` object we will create sensors showing the
+   temperature, the target and the power.
 
 
 Optional Temperature Sensor
diff --git a/tests/test_sensor.py b/tests/test_sensor.py
index 219f284..6e14fc1 100755
--- a/tests/test_sensor.py
+++ b/tests/test_sensor.py
@@ -1,4 +1,5 @@
 """Test moonraker sensor."""
+
 import datetime as dt
 from unittest.mock import patch
 
@@ -110,6 +111,9 @@ async def test_sensor_services_update(hass, get_data):
         ("mainsail_slicer_print_duration_estimate", "8232.0"),
         ("mainsail_object_height", "62.6"),
         ("mainsail_speed_factor", "200.0"),
+        ("mainsail_my_super_heater_temperature", "32.43"),
+        ("mainsail_my_super_heater_target", "32.0"),
+        ("mainsail_my_super_heater_power", "12"),
     ],
 )
 async def test_sensors(