diff --git a/tests/data/hirschmann.json b/tests/data/hirschmann.json
index 4272bc4ae52e..e8dbab75a0f1 100644
--- a/tests/data/hirschmann.json
+++ b/tests/data/hirschmann.json
@@ -3921,7 +3921,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmLEDRSPowerSupp",
+                    "entPhysicalIndex": "hmLEDRSPowerSupply.0",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": null,
                     "user_func": null,
@@ -3946,7 +3946,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmLEDRSRedundanc",
+                    "entPhysicalIndex": "hmLEDRSRedundancyManager.0",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": null,
                     "user_func": null,
@@ -3996,7 +3996,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmPowerSupplySta",
+                    "entPhysicalIndex": "hmPowerSupplyStatus1.1",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": null,
                     "user_func": null,
@@ -4021,7 +4021,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmPowerSupplySta",
+                    "entPhysicalIndex": "hmPowerSupplyStatus1.2",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": null,
                     "user_func": null,
@@ -4242,7 +4242,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmLEDRSPowerSupp",
+                    "entPhysicalIndex": "hmLEDRSPowerSupply.0",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": null,
                     "user_func": null,
@@ -4267,7 +4267,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmLEDRSRedundanc",
+                    "entPhysicalIndex": "hmLEDRSRedundancyManager.0",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": null,
                     "user_func": null,
@@ -4317,7 +4317,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmPowerSupplySta",
+                    "entPhysicalIndex": "hmPowerSupplyStatus1.1",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": 0,
                     "user_func": null,
@@ -4342,7 +4342,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmPowerSupplySta",
+                    "entPhysicalIndex": "hmPowerSupplyStatus1.2",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": 0,
                     "user_func": null,
diff --git a/tests/data/hirschmann_ms4128.json b/tests/data/hirschmann_ms4128.json
index 7dbab5a05cd8..ca9dff281b28 100644
--- a/tests/data/hirschmann_ms4128.json
+++ b/tests/data/hirschmann_ms4128.json
@@ -4069,7 +4069,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmPowerSupplySta",
+                    "entPhysicalIndex": "hmPowerSupplyStatus1.1",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": null,
                     "user_func": null,
@@ -4094,7 +4094,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmPowerSupplySta",
+                    "entPhysicalIndex": "hmPowerSupplyStatus1.2",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": null,
                     "user_func": null,
@@ -4538,7 +4538,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmPowerSupplySta",
+                    "entPhysicalIndex": "hmPowerSupplyStatus1.1",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": 0,
                     "user_func": null,
@@ -4563,7 +4563,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "hmPowerSupplySta",
+                    "entPhysicalIndex": "hmPowerSupplyStatus1.2",
                     "entPhysicalIndex_measured": null,
                     "sensor_prev": 0,
                     "user_func": null,