diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index f41622001fea23..2fc0047d9621bb 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -9110,7 +9110,7 @@ class Test_TC_CC_7_2Suite : public TestCommand
                 uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 34000U));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 36000U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 36500U));
             }
             break;
         case 13:
@@ -9123,7 +9123,7 @@ class Test_TC_CC_7_2Suite : public TestCommand
                 uint16_t value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckConstraintMinValue("value", value, 34500U));
-                VerifyOrReturn(CheckConstraintMaxValue("value", value, 36000U));
+                VerifyOrReturn(CheckConstraintMaxValue("value", value, 36500U));
             }
             break;
         case 15:
@@ -81256,6 +81256,7 @@ class Test_TC_CADMIN_1_9Suite : public TestCommand
         }
         case 18: {
             LogStep(18, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
+            VerifyOrDo(!ShouldSkip("CADMIN.S"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
             value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
@@ -81753,7 +81754,6 @@ class Test_TC_CADMIN_1_10Suite : public TestCommand
         }
         case 18: {
             LogStep(18, "TH_CR2 starts a commissioning process with DUT_CE using Invalid setup code");
-            VerifyOrDo(!ShouldSkip("CADMIN.S"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::CommissionerCommands::Commands::PairWithCode::Type value;
             value.nodeId  = mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL;
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
index e419768c1f7875..952ebfc6a826e6 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -16306,7 +16306,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 34000U));
-            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 36000U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 36500U));
 
             NextTest();
         }];
@@ -16335,7 +16335,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge {
             VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
 
             VerifyOrReturn(CheckConstraintMinValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 34500U));
-            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 36000U));
+            VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("enhancedCurrentHue", [value unsignedShortValue], 36500U));
 
             NextTest();
         }];