diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4f684e7eac..d613e9245e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -19,7 +19,7 @@
 # Testsuite
 ###################################################################################################
 
-/testsuite/                                                 @keycloak/core-maintainers @keycloak/cloud-native-maintainers @keycloak/store-maintainers @keycloak/maintainers
+/testsuite/                                                 @keycloak/core-clients-maintainers @keycloak/core-iam-maintainers @keycloak/cloud-native-maintainers @keycloak/store-maintainers @keycloak/maintainers
 
 ###################################################################################################
 # Core (@keycloak/core-maintainers)
@@ -51,4 +51,4 @@
 /adapters/oidc/js/                                          @keycloak/ui-maintainers
 /rest/admin-ui-ext/                                         @keycloak/ui-maintainers
 /themes/src/main/resources/theme/keycloak.v2/account/       @keycloak/ui-maintainers
-/testsuite/integration-arquillian/tests/other/base-ui/      @keycloak/ui-maintainers
\ No newline at end of file
+/testsuite/integration-arquillian/tests/other/base-ui/      @keycloak/ui-maintainers