diff --git a/examples/chip-tool/templates/tests/partials/test_cluster.zapt b/examples/chip-tool/templates/tests/partials/test_cluster.zapt
index 0a9dfe5b0c8fab..27616a54ed9c2e 100644
--- a/examples/chip-tool/templates/tests/partials/test_cluster.zapt
+++ b/examples/chip-tool/templates/tests/partials/test_cluster.zapt
@@ -318,8 +318,17 @@ class {{filename}}Suite: public TestCommand
     {
         chip::app::StatusIB status(error);
         {{#if response.error}}
+          {{#if optional}}
+          if (status.mStatus == chip::Protocols::InteractionModel::Status::UnsupportedAttribute){
+            {{#unless async}}NextTest();{{/unless}}
+          } else {
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), {{response.error}}));
+            {{#unless async}}NextTest();{{/unless}}
+          }
+          {{else}}
           VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), {{response.error}}));
           {{#unless async}}NextTest();{{/unless}}
+          {{/if}}
         {{else}}
           {{#if optional}}(status.mStatus == chip::Protocols::InteractionModel::Status::UnsupportedAttribute) ? NextTest() : {{/if}}ThrowFailureResponse();
         {{/if}}
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 8ab256586aafee..507785446604c2 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -6865,8 +6865,15 @@ class Test_TC_CC_2_1Suite : public TestCommand
     void OnFailureResponse_47(CHIP_ERROR error)
     {
         chip::app::StatusIB status(error);
-        VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-        NextTest();
+        if (status.mStatus == chip::Protocols::InteractionModel::Status::UnsupportedAttribute)
+        {
+            NextTest();
+        }
+        else
+        {
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            NextTest();
+        }
     }
 
     void OnSuccessResponse_47() { ThrowSuccessResponse(); }
@@ -7010,8 +7017,15 @@ class Test_TC_CC_2_1Suite : public TestCommand
     void OnFailureResponse_53(CHIP_ERROR error)
     {
         chip::app::StatusIB status(error);
-        VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-        NextTest();
+        if (status.mStatus == chip::Protocols::InteractionModel::Status::UnsupportedAttribute)
+        {
+            NextTest();
+        }
+        else
+        {
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            NextTest();
+        }
     }
 
     void OnSuccessResponse_53() { ThrowSuccessResponse(); }
@@ -7082,8 +7096,15 @@ class Test_TC_CC_2_1Suite : public TestCommand
     void OnFailureResponse_56(CHIP_ERROR error)
     {
         chip::app::StatusIB status(error);
-        VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-        NextTest();
+        if (status.mStatus == chip::Protocols::InteractionModel::Status::UnsupportedAttribute)
+        {
+            NextTest();
+        }
+        else
+        {
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            NextTest();
+        }
     }
 
     void OnSuccessResponse_56() { ThrowSuccessResponse(); }
@@ -7153,8 +7174,15 @@ class Test_TC_CC_2_1Suite : public TestCommand
     void OnFailureResponse_59(CHIP_ERROR error)
     {
         chip::app::StatusIB status(error);
-        VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-        NextTest();
+        if (status.mStatus == chip::Protocols::InteractionModel::Status::UnsupportedAttribute)
+        {
+            NextTest();
+        }
+        else
+        {
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            NextTest();
+        }
     }
 
     void OnSuccessResponse_59() { ThrowSuccessResponse(); }
@@ -21690,8 +21718,15 @@ class Test_TC_FLW_2_1Suite : public TestCommand
     void OnFailureResponse_12(CHIP_ERROR error)
     {
         chip::app::StatusIB status(error);
-        VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-        NextTest();
+        if (status.mStatus == chip::Protocols::InteractionModel::Status::UnsupportedAttribute)
+        {
+            NextTest();
+        }
+        else
+        {
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            NextTest();
+        }
     }
 
     void OnSuccessResponse_12() { ThrowSuccessResponse(); }
@@ -44311,8 +44346,15 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand
     void OnFailureResponse_55(CHIP_ERROR error)
     {
         chip::app::StatusIB status(error);
-        VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-        NextTest();
+        if (status.mStatus == chip::Protocols::InteractionModel::Status::UnsupportedAttribute)
+        {
+            NextTest();
+        }
+        else
+        {
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            NextTest();
+        }
     }
 
     void OnSuccessResponse_55() { ThrowSuccessResponse(); }
@@ -44383,8 +44425,15 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand
     void OnFailureResponse_58(CHIP_ERROR error)
     {
         chip::app::StatusIB status(error);
-        VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-        NextTest();
+        if (status.mStatus == chip::Protocols::InteractionModel::Status::UnsupportedAttribute)
+        {
+            NextTest();
+        }
+        else
+        {
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            NextTest();
+        }
     }
 
     void OnSuccessResponse_58() { ThrowSuccessResponse(); }
@@ -44430,8 +44479,15 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand
     void OnFailureResponse_60(CHIP_ERROR error)
     {
         chip::app::StatusIB status(error);
-        VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
-        NextTest();
+        if (status.mStatus == chip::Protocols::InteractionModel::Status::UnsupportedAttribute)
+        {
+            NextTest();
+        }
+        else
+        {
+            VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE));
+            NextTest();
+        }
     }
 
     void OnSuccessResponse_60() { ThrowSuccessResponse(); }