diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 2bacda74cba92c..e3cad481ffec12 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -18770,7 +18770,6 @@ class Test_TC_LVL_3_1Suite : public TestCommand
         }
         case 13: {
             LogStep(13, "Wait 10000ms");
-            VerifyOrDo(!ShouldSkip("LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = 10000UL;
@@ -18785,7 +18784,6 @@ class Test_TC_LVL_3_1Suite : public TestCommand
         }
         case 15: {
             LogStep(15, "Wait 10000ms");
-            VerifyOrDo(!ShouldSkip("LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = 10000UL;
@@ -18800,7 +18798,6 @@ class Test_TC_LVL_3_1Suite : public TestCommand
         }
         case 17: {
             LogStep(17, "Wait 10000ms");
-            VerifyOrDo(!ShouldSkip("LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = 10000UL;
@@ -18815,7 +18812,6 @@ class Test_TC_LVL_3_1Suite : public TestCommand
         }
         case 19: {
             LogStep(19, "Wait 5000ms");
-            VerifyOrDo(!ShouldSkip("LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = 5000UL;
@@ -19779,7 +19775,6 @@ class Test_TC_LVL_5_1Suite : public TestCommand
         }
         case 12: {
             LogStep(12, "Wait 10s");
-            VerifyOrDo(!ShouldSkip("LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = 10000UL;
@@ -19794,7 +19789,6 @@ class Test_TC_LVL_5_1Suite : public TestCommand
         }
         case 14: {
             LogStep(14, "Wait 10s");
-            VerifyOrDo(!ShouldSkip("LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = 10000UL;
@@ -19809,7 +19803,6 @@ class Test_TC_LVL_5_1Suite : public TestCommand
         }
         case 16: {
             LogStep(16, "Wait 10s");
-            VerifyOrDo(!ShouldSkip("LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = 10000UL;
@@ -19824,7 +19817,6 @@ class Test_TC_LVL_5_1Suite : public TestCommand
         }
         case 18: {
             LogStep(18, "Wait 5000ms");
-            VerifyOrDo(!ShouldSkip("LVL.S.M.VarRate"), return ContinueOnChipMainThread(CHIP_NO_ERROR));
             ListFreer listFreer;
             chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value;
             value.ms = 5000UL;
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 09cba1afbd3fb7..497e858bbc1414 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -26645,10 +26645,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             break;
         case 13:
             ChipLogProgress(chipTool, " ***** Test Step 13 : Wait 10000ms\n");
-            if (ShouldSkip("LVL.S.M.VarRate")) {
-                NextTest();
-                return;
-            }
             err = TestWait10000ms_13();
             break;
         case 14:
@@ -26661,10 +26657,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             break;
         case 15:
             ChipLogProgress(chipTool, " ***** Test Step 15 : Wait 10000ms\n");
-            if (ShouldSkip("LVL.S.M.VarRate")) {
-                NextTest();
-                return;
-            }
             err = TestWait10000ms_15();
             break;
         case 16:
@@ -26677,10 +26669,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             break;
         case 17:
             ChipLogProgress(chipTool, " ***** Test Step 17 : Wait 10000ms\n");
-            if (ShouldSkip("LVL.S.M.VarRate")) {
-                NextTest();
-                return;
-            }
             err = TestWait10000ms_17();
             break;
         case 18:
@@ -26693,10 +26681,6 @@ class Test_TC_LVL_3_1 : public TestCommandBridge {
             break;
         case 19:
             ChipLogProgress(chipTool, " ***** Test Step 19 : Wait 5000ms\n");
-            if (ShouldSkip("LVL.S.M.VarRate")) {
-                NextTest();
-                return;
-            }
             err = TestWait5000ms_19();
             break;
         case 20:
@@ -29040,10 +29024,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
             break;
         case 12:
             ChipLogProgress(chipTool, " ***** Test Step 12 : Wait 10s\n");
-            if (ShouldSkip("LVL.S.M.VarRate")) {
-                NextTest();
-                return;
-            }
             err = TestWait10s_12();
             break;
         case 13:
@@ -29056,10 +29036,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
             break;
         case 14:
             ChipLogProgress(chipTool, " ***** Test Step 14 : Wait 10s\n");
-            if (ShouldSkip("LVL.S.M.VarRate")) {
-                NextTest();
-                return;
-            }
             err = TestWait10s_14();
             break;
         case 15:
@@ -29072,10 +29048,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
             break;
         case 16:
             ChipLogProgress(chipTool, " ***** Test Step 16 : Wait 10s\n");
-            if (ShouldSkip("LVL.S.M.VarRate")) {
-                NextTest();
-                return;
-            }
             err = TestWait10s_16();
             break;
         case 17:
@@ -29088,10 +29060,6 @@ class Test_TC_LVL_5_1 : public TestCommandBridge {
             break;
         case 18:
             ChipLogProgress(chipTool, " ***** Test Step 18 : Wait 5000ms\n");
-            if (ShouldSkip("LVL.S.M.VarRate")) {
-                NextTest();
-                return;
-            }
             err = TestWait5000ms_18();
             break;
         case 19: