diff --git a/tests/acceptance/features/bootstrap/Provisioning.php b/tests/acceptance/features/bootstrap/Provisioning.php
index 3ea3ed5abe00..5edd8beec012 100644
--- a/tests/acceptance/features/bootstrap/Provisioning.php
+++ b/tests/acceptance/features/bootstrap/Provisioning.php
@@ -534,8 +534,8 @@ public function connectToLdap(array $suiteParameters):void {
 		$useSsl = false;
 		if (OcisHelper::isTestingOnOcisOrReva()) {
 			$this->ldapBaseDN = OcisHelper::getBaseDN();
-			$this->ldapUsersOU = OcisHelper::getGroupsOU();
-			$this->ldapGroupsOU = OcisHelper::getUsersOU();
+			$this->ldapUsersOU = OcisHelper::getUsersOU();
+			$this->ldapGroupsOU = OcisHelper::getGroupsOU();
 			$this->ldapGroupSchema = OcisHelper::getGroupSchema();
 			$this->ldapHost = OcisHelper::getHostname();
 			$this->ldapPort = OcisHelper::getLdapPort();
@@ -734,6 +734,8 @@ public function createLdapUser(array $setting):void {
 		}
 		if (isset($setting["email"])) {
 			$entry['mail'] = $setting["email"];
+		} elseif (OcisHelper::isTestingOnOcis()) {
+			$entry['mail'] = $userId . '@owncloud.com';
 		}
 		$entry['gidNumber'] = 5000;
 		$entry['uidNumber'] = $uidNumber;