diff --git a/scripts/py_matter_yamltests/matter_yamltests/parser.py b/scripts/py_matter_yamltests/matter_yamltests/parser.py
index 5307d9daffd58b..0a4bc23e104766 100644
--- a/scripts/py_matter_yamltests/matter_yamltests/parser.py
+++ b/scripts/py_matter_yamltests/matter_yamltests/parser.py
@@ -38,6 +38,7 @@
     'endpoint',
     'identity',
     'fabricFiltered',
+    'groupId',
     'verification',
     'nodeId',
     'attribute',
@@ -198,6 +199,7 @@ def __init__(self, test: dict, config: dict, definitions: SpecDefinitions, pics_
         self.label = _value_or_none(test, 'label')
         self.optional = _value_or_none(test, 'optional')
         self.node_id = _value_or_config(test, 'nodeId', config)
+        self.group_id = _value_or_config(test, 'groupId', config)
         self.cluster = _value_or_config(test, 'cluster', config)
         self.command = _value_or_config(test, 'command', config)
         self.attribute = _value_or_none(test, 'attribute')
@@ -426,6 +428,10 @@ def optional(self):
     def node_id(self):
         return self._test.node_id
 
+    @property
+    def group_id(self):
+        return self._test.group_id
+
     @property
     def cluster(self):
         return self._test.cluster
diff --git a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
index dbd728018f77aa..e6759dec28845e 100644
--- a/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
+++ b/src/app/tests/suites/TestGroupKeyManagementCluster.yaml
@@ -242,13 +242,13 @@ tests:
                   {
                       FabricIndex: 1,
                       GroupId: 0x0103,
-                      endpoints: [1],
+                      Endpoints: [1],
                       GroupName: "Group #3",
                   },
                   {
                       FabricIndex: 1,
                       GroupId: 0x0104,
-                      endpoints: [1],
+                      Endpoints: [1],
                       GroupName: "Group #4",
                   },
               ]
@@ -320,13 +320,13 @@ tests:
                   {
                       FabricIndex: 1,
                       GroupId: 0x0103,
-                      endpoints: [1],
+                      Endpoints: [1],
                       GroupName: "Group #3",
                   },
                   {
                       FabricIndex: 1,
                       GroupId: 0x0104,
-                      endpoints: [1],
+                      Endpoints: [1],
                       GroupName: "Group #4",
                   },
               ]