diff --git a/smpclient/requests/enumeration_management.py b/smpclient/requests/enumeration_management.py
new file mode 100644
index 0000000..be340a7
--- /dev/null
+++ b/smpclient/requests/enumeration_management.py
@@ -0,0 +1,22 @@
+from smp import enumeration_management as smpem
+
+
+class _EnumGroupBase:
+    _ErrorV1 = smpem.EnumManagementErrorV1
+    _ErrorV2 = smpem.EnumManagementErrorV2
+
+
+class CountSupportedGroups(smpem.GroupCountRequest, _EnumGroupBase):
+    _Response = smpem.GroupCountResponse
+
+
+class ListSupportedGroups(smpem.ListOfGroupsRequest, _EnumGroupBase):
+    _Response = smpem.ListOfGroupsResponse
+
+
+class GroupId(smpem.GroupIdRequest, _EnumGroupBase):
+    _Response = smpem.GroupIdResponse
+
+
+class GroupDetails(smpem.GroupDetailsRequest, _EnumGroupBase):
+    _Response = smpem.GroupDetailsResponse
diff --git a/tests/test_requests.py b/tests/test_requests.py
index 9f86650..e379be2 100644
--- a/tests/test_requests.py
+++ b/tests/test_requests.py
@@ -5,6 +5,7 @@
 from typing import Tuple, Type
 
 import pytest
+from smp import enumeration_management as smpem
 from smp import error as smperr
 from smp import file_management as smpfs
 from smp import header as smphdr
@@ -18,6 +19,12 @@
 from smp.user import intercreate as smpic
 
 from smpclient.generics import SMPRequest, TEr1, TEr2, TRep
+from smpclient.requests.enumeration_management import (
+    CountSupportedGroups,
+    GroupDetails,
+    GroupId,
+    ListSupportedGroups,
+)
 from smpclient.requests.file_management import (
     FileClose,
     FileDownload,
@@ -55,6 +62,34 @@
 @pytest.mark.parametrize(
     "test_tuple",
     (
+        (
+            smpem.GroupCountRequest(),
+            CountSupportedGroups(),
+            smpem.GroupCountResponse,
+            smpem.EnumManagementErrorV1,
+            smpem.EnumManagementErrorV2,
+        ),
+        (
+            smpem.ListOfGroupsRequest(),
+            ListSupportedGroups(),
+            smpem.ListOfGroupsResponse,
+            smpem.EnumManagementErrorV1,
+            smpem.EnumManagementErrorV2,
+        ),
+        (
+            smpem.GroupIdRequest(),
+            GroupId(),
+            smpem.GroupIdResponse,
+            smpem.EnumManagementErrorV1,
+            smpem.EnumManagementErrorV2,
+        ),
+        (
+            smpem.GroupDetailsRequest(),
+            GroupDetails(),
+            smpem.GroupDetailsResponse,
+            smpem.EnumManagementErrorV1,
+            smpem.EnumManagementErrorV2,
+        ),
         (
             smpimg.ImageStatesReadRequest(),
             ImageStatesRead(),