diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
index 70e46d8e6ef7a0..0bd3fe0af9332f 100644
--- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
+++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp
@@ -221,7 +221,7 @@ CHIP_ERROR GeneralDiagosticsAttrAccess::Read(const ConcreteReadAttributePath & a
         uint32_t features = 0;
 
 #if CHIP_CONFIG_MAX_PATHS_PER_INVOKE > 1
-        features |= chip::to_underlying(Clusters::GeneralDiagnostics::Feature::kDataModelTest);
+        features |= to_underlying(Clusters::GeneralDiagnostics::Feature::kDataModelTest);
 #endif // CHIP_CONFIG_MAX_PATHS_PER_INVOKE > 1
 
         return aEncoder.Encode(features);
@@ -455,7 +455,7 @@ bool emberAfGeneralDiagnosticsClusterPayloadTestRequestCallback(CommandHandler *
     // Max allowed is 2048.
     if (commandData.count > 2048)
     {
-        commandObj->AddStatus(commandPath, Status::InvalidCommand);
+        commandObj->AddStatus(commandPath, Status::ConstraintError);
         return true;
     }
 
diff --git a/src/python_testing/TC_TestEventTrigger.py b/src/python_testing/TC_TestEventTrigger.py
index ff4d8c4ebdd087..b11f115016813a 100644
--- a/src/python_testing/TC_TestEventTrigger.py
+++ b/src/python_testing/TC_TestEventTrigger.py
@@ -146,8 +146,8 @@ async def test_multiple_command_request_feature_present_if_needed(self):
         if has_data_model_test_feature:
             # Test count too large (above max 2048)
             with asserts.assert_raises_regex(InteractionModelError,
-                                             "InvalidCommand",
-                                             "PayloadTestRequest with request too large (> 2048) must return InvalidCommand"):
+                                             "ConstraintError",
+                                             "PayloadTestRequest with request too large (> 2048) must return ConstraintError"):
                 await dev_ctrl.SendCommand(
                     self.dut_node_id,
                     endpoint=0,