diff --git a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_2.yaml b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_2.yaml
index 9e508a388efa7a..55199f18f15799 100644
--- a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_2.yaml
@@ -71,4 +71,4 @@ tests:
       command: "readAttribute"
       attribute: "CurrentChannel"
       response:
-          value: [MajorNumber: majornumber, MinorNumber: minornumber]
+          value: { MajorNumber: majornumber, MinorNumber: minornumber }
diff --git a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml
index bf98153f0c4526..feb1ed3f5f3524 100644
--- a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml
@@ -23,8 +23,14 @@ config:
     endpoint: 1
     majornumber:
         type: int16u
-        defaultValue: 9
+        defaultValue: 6
     minornumber:
+        type: int16u
+        defaultValue: 0
+    majornumber2:
+        type: int16u
+        defaultValue: 9
+    minornumber2:
         type: int16u
         defaultValue: 1
 
@@ -59,7 +65,7 @@ tests:
       command: "readAttribute"
       attribute: "CurrentChannel"
       response:
-          value: [MajorNumber: majornumber, MinorNumber: minornumber]
+          value: { MajorNumber: majornumber, MinorNumber: minornumber }
 
     - label: "Sends a SkipChannel command to the DUT"
       PICS: CHANNEL.S.C03.Rsp
@@ -85,6 +91,6 @@ tests:
       command: "readAttribute"
       attribute: "CurrentChannel"
       response:
-          value: [MajorNumber: majornumber, MinorNumber: minornumber + 1]
+          value: { MajorNumber: majornumber2, MinorNumber: minornumber2 }
           constraints:
               type: ChannelInfoStruct
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index 208a2493caac31..b5b830bdfc252f 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -34637,6 +34637,10 @@ class Test_TC_CHANNEL_5_2Suite : public TestCommand
                 chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfoStruct::DecodableType> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("currentChannel", value));
+                VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber,
+                                          mMajornumber.HasValue() ? mMajornumber.Value() : 9U));
+                VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber,
+                                          mMinornumber.HasValue() ? mMinornumber.Value() : 1U));
             }
             break;
         default:
@@ -34718,6 +34722,8 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
         AddArgument("majornumber", 0, UINT16_MAX, &mMajornumber);
         AddArgument("minornumber", 0, UINT16_MAX, &mMinornumber);
+        AddArgument("majornumber2", 0, UINT16_MAX, &mMajornumber2);
+        AddArgument("minornumber2", 0, UINT16_MAX, &mMinornumber2);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
 
@@ -34734,6 +34740,8 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mMajornumber;
     chip::Optional<uint16_t> mMinornumber;
+    chip::Optional<uint16_t> mMajornumber2;
+    chip::Optional<uint16_t> mMinornumber2;
     chip::Optional<uint16_t> mTimeout;
 
     chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; }
@@ -34781,6 +34789,10 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand
                 chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfoStruct::DecodableType> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("currentChannel", value));
+                VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber,
+                                          mMajornumber.HasValue() ? mMajornumber.Value() : 6U));
+                VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber,
+                                          mMinornumber.HasValue() ? mMinornumber.Value() : 0U));
             }
             break;
         case 4:
@@ -34796,6 +34808,10 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand
                 chip::app::DataModel::Nullable<chip::app::Clusters::Channel::Structs::ChannelInfoStruct::DecodableType> value;
                 VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
                 VerifyOrReturn(CheckValueNonNull("currentChannel", value));
+                VerifyOrReturn(CheckValue("currentChannel.Value().majorNumber", value.Value().majorNumber,
+                                          mMajornumber2.HasValue() ? mMajornumber2.Value() : 9U));
+                VerifyOrReturn(CheckValue("currentChannel.Value().minorNumber", value.Value().minorNumber,
+                                          mMinornumber2.HasValue() ? mMinornumber2.Value() : 1U));
                 VerifyOrReturn(CheckConstraintType("value", "ChannelInfoStruct", "ChannelInfoStruct"));
             }
             break;
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 052e8353d0df1a..39b5ddbbd8c4b3 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -45565,6 +45565,10 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge {
             {
                 id actualValue = value;
                 VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue));
+                VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber,
+                    mMajornumber.HasValue() ? mMajornumber.Value() : 9U));
+                VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber,
+                    mMinornumber.HasValue() ? mMinornumber.Value() : 1U));
             }
 
             NextTest();
@@ -45586,6 +45590,8 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge {
         AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint);
         AddArgument("majornumber", 0, UINT16_MAX, &mMajornumber);
         AddArgument("minornumber", 0, UINT16_MAX, &mMinornumber);
+        AddArgument("majornumber2", 0, UINT16_MAX, &mMajornumber2);
+        AddArgument("minornumber2", 0, UINT16_MAX, &mMinornumber2);
         AddArgument("timeout", 0, UINT16_MAX, &mTimeout);
     }
     // NOLINTEND(clang-analyzer-nullability.NullPassedToNonnull)
@@ -45727,6 +45733,8 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge {
     chip::Optional<chip::EndpointId> mEndpoint;
     chip::Optional<uint16_t> mMajornumber;
     chip::Optional<uint16_t> mMinornumber;
+    chip::Optional<uint16_t> mMajornumber2;
+    chip::Optional<uint16_t> mMinornumber2;
     chip::Optional<uint16_t> mTimeout;
 
     CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_0()
@@ -45796,6 +45804,10 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge {
             {
                 id actualValue = value;
                 VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue));
+                VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber,
+                    mMajornumber.HasValue() ? mMajornumber.Value() : 6U));
+                VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber,
+                    mMinornumber.HasValue() ? mMinornumber.Value() : 0U));
             }
 
             NextTest();
@@ -45854,6 +45866,10 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge {
             {
                 id actualValue = value;
                 VerifyOrReturn(CheckValueNonNull("CurrentChannel", actualValue));
+                VerifyOrReturn(CheckValue("MajorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).majorNumber,
+                    mMajornumber2.HasValue() ? mMajornumber2.Value() : 9U));
+                VerifyOrReturn(CheckValue("MinorNumber", ((MTRChannelClusterChannelInfoStruct *) actualValue).minorNumber,
+                    mMinornumber2.HasValue() ? mMinornumber2.Value() : 1U));
             }
             if (value != nil) {