diff --git a/homeassistant/components/rainmachine/binary_sensor.py b/homeassistant/components/rainmachine/binary_sensor.py
index bfd36ecf550..55d009ad6f5 100644
--- a/homeassistant/components/rainmachine/binary_sensor.py
+++ b/homeassistant/components/rainmachine/binary_sensor.py
@@ -7,6 +7,7 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import ENTITY_CATEGORY_DIAGNOSTIC
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -50,24 +51,28 @@ BINARY_SENSOR_DESCRIPTIONS = (
         key=TYPE_FREEZE,
         name="Freeze Restrictions",
         icon="mdi:cancel",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         api_category=DATA_RESTRICTIONS_CURRENT,
     ),
     RainMachineBinarySensorDescription(
         key=TYPE_FREEZE_PROTECTION,
         name="Freeze Protection",
         icon="mdi:weather-snowy",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         api_category=DATA_RESTRICTIONS_UNIVERSAL,
     ),
     RainMachineBinarySensorDescription(
         key=TYPE_HOT_DAYS,
         name="Extra Water on Hot Days",
         icon="mdi:thermometer-lines",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         api_category=DATA_RESTRICTIONS_UNIVERSAL,
     ),
     RainMachineBinarySensorDescription(
         key=TYPE_HOURLY,
         name="Hourly Restrictions",
         icon="mdi:cancel",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         entity_registry_enabled_default=False,
         api_category=DATA_RESTRICTIONS_CURRENT,
     ),
@@ -75,6 +80,7 @@ BINARY_SENSOR_DESCRIPTIONS = (
         key=TYPE_MONTH,
         name="Month Restrictions",
         icon="mdi:cancel",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         entity_registry_enabled_default=False,
         api_category=DATA_RESTRICTIONS_CURRENT,
     ),
@@ -82,6 +88,7 @@ BINARY_SENSOR_DESCRIPTIONS = (
         key=TYPE_RAINDELAY,
         name="Rain Delay Restrictions",
         icon="mdi:cancel",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         entity_registry_enabled_default=False,
         api_category=DATA_RESTRICTIONS_CURRENT,
     ),
@@ -89,6 +96,7 @@ BINARY_SENSOR_DESCRIPTIONS = (
         key=TYPE_RAINSENSOR,
         name="Rain Sensor Restrictions",
         icon="mdi:cancel",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         entity_registry_enabled_default=False,
         api_category=DATA_RESTRICTIONS_CURRENT,
     ),
@@ -96,6 +104,7 @@ BINARY_SENSOR_DESCRIPTIONS = (
         key=TYPE_WEEKDAY,
         name="Weekday Restrictions",
         icon="mdi:cancel",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         entity_registry_enabled_default=False,
         api_category=DATA_RESTRICTIONS_CURRENT,
     ),
diff --git a/homeassistant/components/rainmachine/sensor.py b/homeassistant/components/rainmachine/sensor.py
index 6a1da223758..6c95552e26f 100644
--- a/homeassistant/components/rainmachine/sensor.py
+++ b/homeassistant/components/rainmachine/sensor.py
@@ -13,6 +13,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     DEVICE_CLASS_TEMPERATURE,
+    ENTITY_CATEGORY_DIAGNOSTIC,
     TEMP_CELSIUS,
     VOLUME_CUBIC_METERS,
 )
@@ -49,6 +50,7 @@ SENSOR_DESCRIPTIONS = (
         name="Flow Sensor Clicks per Cubic Meter",
         icon="mdi:water-pump",
         native_unit_of_measurement=f"clicks/{VOLUME_CUBIC_METERS}",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         entity_registry_enabled_default=False,
         state_class=STATE_CLASS_MEASUREMENT,
         api_category=DATA_PROVISION_SETTINGS,
@@ -57,6 +59,7 @@ SENSOR_DESCRIPTIONS = (
         key=TYPE_FLOW_SENSOR_CONSUMED_LITERS,
         name="Flow Sensor Consumed Liters",
         icon="mdi:water-pump",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         native_unit_of_measurement="liter",
         entity_registry_enabled_default=False,
         state_class=STATE_CLASS_TOTAL_INCREASING,
@@ -66,6 +69,7 @@ SENSOR_DESCRIPTIONS = (
         key=TYPE_FLOW_SENSOR_START_INDEX,
         name="Flow Sensor Start Index",
         icon="mdi:water-pump",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         native_unit_of_measurement="index",
         entity_registry_enabled_default=False,
         api_category=DATA_PROVISION_SETTINGS,
@@ -74,6 +78,7 @@ SENSOR_DESCRIPTIONS = (
         key=TYPE_FLOW_SENSOR_WATERING_CLICKS,
         name="Flow Sensor Clicks",
         icon="mdi:water-pump",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         native_unit_of_measurement="clicks",
         entity_registry_enabled_default=False,
         state_class=STATE_CLASS_MEASUREMENT,
@@ -83,6 +88,7 @@ SENSOR_DESCRIPTIONS = (
         key=TYPE_FREEZE_TEMP,
         name="Freeze Protect Temperature",
         icon="mdi:thermometer",
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         native_unit_of_measurement=TEMP_CELSIUS,
         device_class=DEVICE_CLASS_TEMPERATURE,
         state_class=STATE_CLASS_MEASUREMENT,