diff --git a/tests/acceptance/features/apiProvisioning-v1/addUser.feature b/tests/acceptance/features/apiProvisioning-v1/addUser.feature
index 3990a8ce72f1..3881877f7167 100644
--- a/tests/acceptance/features/apiProvisioning-v1/addUser.feature
+++ b/tests/acceptance/features/apiProvisioning-v1/addUser.feature
@@ -139,4 +139,27 @@ Feature: add user
     When unauthorized user "Alice" tries to create new user "brand-new-user" with password "%alt1%" using the provisioning API
     Then the OCS status code should be "997"
     And the HTTP status code should be "401"
+    And user "brand-new-user" should not exist
+
+  Scenario: subadmin should be able to create a new user into their group
+    Given user "brand-new-user" has been deleted
+    And user "subadmin" has been created with default attributes and without skeleton files
+    And group "group101" has been created
+    And user "subadmin" has been added to group "group101"
+    And user "subadmin" has been made a subadmin of group "group101"
+    When the groupadmin "subadmin" sends a user creation request for user "brand-new-user" password "%alt1%" group "group101" using the provisioning API
+    Then the OCS status code should be "100"
+    And the HTTP status code should be "200"
+    And user "brand-new-user" should exist
+
+  Scenario: subadmin should not be able to create a new user into other group
+    Given user "brand-new-user" has been deleted
+    And user "subadmin" has been created with default attributes and without skeleton files
+    And group "group101" has been created
+    And group "group102" has been created
+    And user "subadmin" has been added to group "group101"
+    And user "subadmin" has been made a subadmin of group "group101"
+    When the groupadmin "subadmin" tries to create new user "brand-new-user" password "%alt1%" in other group "group102" using the provisioning API
+    Then the OCS status code should be "105"
+    And the HTTP status code should be "200"
     And user "brand-new-user" should not exist
\ No newline at end of file
diff --git a/tests/acceptance/features/apiProvisioning-v2/addUser.feature b/tests/acceptance/features/apiProvisioning-v2/addUser.feature
index ca8c2303a91e..5352c451bc47 100644
--- a/tests/acceptance/features/apiProvisioning-v2/addUser.feature
+++ b/tests/acceptance/features/apiProvisioning-v2/addUser.feature
@@ -139,4 +139,27 @@ Feature: add user
     When unauthorized user "Alice" tries to create new user "brand-new-user" with password "%alt1%" using the provisioning API
     Then the OCS status code should be "997"
     And the HTTP status code should be "401"
+    And user "brand-new-user" should not exist
+
+  Scenario: subadmin should be able to create a new user into their group
+    Given user "brand-new-user" has been deleted
+    And user "subadmin" has been created with default attributes and without skeleton files
+    And group "group101" has been created
+    And user "subadmin" has been added to group "group101"
+    And user "subadmin" has been made a subadmin of group "group101"
+    When the groupadmin "subadmin" sends a user creation request for user "brand-new-user" password "%alt1%" group "group101" using the provisioning API
+    Then the OCS status code should be "200"
+    And the HTTP status code should be "200"
+    And user "brand-new-user" should exist
+
+  Scenario: subadmin should not be able to create a new user into other group
+    Given user "brand-new-user" has been deleted
+    And user "subadmin" has been created with default attributes and without skeleton files
+    And group "group101" has been created
+    And group "group102" has been created
+    And user "subadmin" has been added to group "group101"
+    And user "subadmin" has been made a subadmin of group "group101"
+    When the groupadmin "subadmin" tries to create new user "brand-new-user" password "%alt1%" in other group "group102" using the provisioning API
+    Then the OCS status code should be "400"
+    And the HTTP status code should be "400"
     And user "brand-new-user" should not exist
\ No newline at end of file
diff --git a/tests/acceptance/features/bootstrap/Provisioning.php b/tests/acceptance/features/bootstrap/Provisioning.php
index 1e5f846704aa..49f3abb4f5f2 100644
--- a/tests/acceptance/features/bootstrap/Provisioning.php
+++ b/tests/acceptance/features/bootstrap/Provisioning.php
@@ -1366,6 +1366,13 @@ public function userSendsUserCreationRequestUsingTheProvisioningApi($user, $user
 			"/cloud/users",
 			$bodyTable
 		);
+		$this->addUserToCreatedUsersList(
+			$userToCreate,
+			$password,
+			null,
+			$email,
+			$this->theHTTPStatusCodeWasSuccess()
+		);
 	}
 
 	/**
@@ -1418,6 +1425,105 @@ public function theAdministratorCreatesUserPasswordGroupUsingTheProvisioningApi(
 		}
 	}
 
+	/**
+	 * @When /^the groupadmin "([^"]*)" sends a user creation request for user "([^"]*)" password "([^"]*)" group "([^"]*)" using the provisioning API$/
+	 *
+	 * @param string $groupadmin
+	 * @param string $userToCreate
+	 * @param string $password
+	 * @param string $group
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function theGroupAdminCreatesUserPasswordGroupUsingTheProvisioningApi(
+		$groupadmin, $userToCreate, $password, $group
+	) {
+		$userToCreate = $this->getActualUsername($userToCreate);
+		$password = $this->getActualPassword($password);
+		if (OcisHelper::isTestingOnOcisOrReva()) {
+			$email = $userToCreate . '@owncloud.org';
+			$bodyTable = new TableNode(
+				[
+					['userid', $userToCreate],
+					['password', $userToCreate],
+					['username', $userToCreate],
+					['email', $email],
+					['groups[]', $group],
+				]
+			);
+		} else {
+			$email = null;
+			$bodyTable = new TableNode(
+				[['userid', $userToCreate], ['password', $password], ['groups[]', $group]]
+			);
+		}
+		$this->ocsContext->userSendsHTTPMethodToOcsApiEndpointWithBody(
+			$groupadmin,
+			"POST",
+			"/cloud/users",
+			$bodyTable
+		);
+		$this->addUserToCreatedUsersList(
+			$userToCreate,
+			$password,
+			null,
+			$email,
+			$this->theHTTPStatusCodeWasSuccess()
+		);
+		if (OcisHelper::isTestingOnOcisOrReva()) {
+			$this->manuallyAddSkeletonFilesForUser($userToCreate, $password);
+		}
+	}
+
+	/**
+	 * @When /^the groupadmin "([^"]*)" tries to create new user "([^"]*)" password "([^"]*)" in other group "([^"]*)" using the provisioning API$/
+	 *
+	 * @param string $groupadmin
+	 * @param string $userToCreate
+	 * @param string $password
+	 * @param string $group
+	 *
+	 * @return void
+	 * @throws Exception
+	 */
+	public function theGroupAdminCreatesUserPasswordInOtherGroupUsingTheProvisioningApi(
+		$groupadmin, $userToCreate, $password, $group
+	) {
+		$userToCreate = $this->getActualUsername($userToCreate);
+		$password = $this->getActualPassword($password);
+		if (OcisHelper::isTestingOnOcisOrReva()) {
+			$email = $userToCreate . '@owncloud.org';
+			$bodyTable = new TableNode(
+				[
+					['userid', $userToCreate],
+					['password', $userToCreate],
+					['username', $userToCreate],
+					['email', $email],
+					['groups[]', $group],
+				]
+			);
+		} else {
+			$email = null;
+			$bodyTable = new TableNode(
+				[['userid', $userToCreate], ['password', $password], ['groups[]', $group]]
+			);
+		}
+		$this->ocsContext->userSendsHTTPMethodToOcsApiEndpointWithBody(
+			$groupadmin,
+			"POST",
+			"/cloud/users",
+			$bodyTable
+		);
+		$this->addUserToCreatedUsersList(
+			$userToCreate,
+			$password,
+			null,
+			$email,
+			$this->theHTTPStatusCodeWasSuccess()
+		);
+	}
+
 	/**
 	 * @param string $username
 	 * @param string $password