diff --git a/tests/acceptance/TestHelpers/OcHelper.php b/tests/acceptance/TestHelpers/OcHelper.php
index f9cca00b66..d0fd082816 100644
--- a/tests/acceptance/TestHelpers/OcHelper.php
+++ b/tests/acceptance/TestHelpers/OcHelper.php
@@ -49,6 +49,7 @@ class OcHelper {
 	public const STORAGE_DRIVERS = [
 		StorageDriver::OCIS,
 		StorageDriver::EOS,
+		StorageDriver::OWNCLOUD,
 		StorageDriver::S3NG,
 		StorageDriver::POSIX
 	];
@@ -139,7 +140,7 @@ class OcHelper {
 				$user = $user["actualUsername"];
 			}
 			if ($deleteCmd === false) {
-				if (self::getStorageDriver() === StorageDriver::OCIS) {
+				if (self::getStorageDriver() === StorageDriver::OWNCLOUD) {
 					self::recurseRmdir(self::getOcRevaDataRoot() . $user);
 				}
 				continue;
@@ -205,7 +206,7 @@ class OcHelper {
 	 */
 	public static function getBaseDN(): string {
 		$dn = \getenv("REVA_LDAP_BASE_DN");
-		return $dn ?: "dc=opencloud,dc=com";
+		return $dn ?: "dc=owncloud,dc=com";
 	}
 
 	/**
@@ -244,7 +245,7 @@ class OcHelper {
 	 */
 	public static function getBindDN(): string {
 		$dn = \getenv("REVA_LDAP_BIND_DN");
-		return $dn ?: "cn=admin,dc=opencloud,dc=com";
+		return $dn ?: "cn=admin,dc=owncloud,dc=com";
 	}
 
 	/**
diff --git a/tests/acceptance/bootstrap/FeatureContext.php b/tests/acceptance/bootstrap/FeatureContext.php
index cf03f7094d..3ab82ae796 100644
--- a/tests/acceptance/bootstrap/FeatureContext.php
+++ b/tests/acceptance/bootstrap/FeatureContext.php
@@ -752,7 +752,7 @@ class FeatureContext extends BehatVariablesContext {
 	 */
 	public function getStorageUsersRoot(): string {
 		$ocDataPath = getenv("OC_BASE_DATA_PATH") ? getenv("OC_BASE_DATA_PATH") : getenv("HOME") . '/.opencloud';
-		return getenv("STORAGE_USERS_OC_ROOT") ? getenv("STORAGE_USERS_OC_ROOT") : $ocDataPath . "/storage/users";
+		return getenv("STORAGE_USERS_OCIS_ROOT") ? getenv("STORAGE_USERS_OCIS_ROOT") : $ocDataPath . "/storage/users";
 	}
 
 	/**
diff --git a/tests/acceptance/config/ldap-users.ldif b/tests/acceptance/config/ldap-users.ldif
index cea3ef7439..5216b13589 100644
--- a/tests/acceptance/config/ldap-users.ldif
+++ b/tests/acceptance/config/ldap-users.ldif
@@ -1,9 +1,9 @@
-dn: ou=TestUsers,dc=opencloud,dc=com
+dn: ou=TestUsers,dc=owncloud,dc=com
 objectclass: top
 objectclass: organizationalUnit
 ou: TestUsers
 
-dn: ou=TestGroups,dc=opencloud,dc=com
+dn: ou=TestGroups,dc=owncloud,dc=com
 objectclass: top
 objectclass: organizationalUnit
 ou: TestGroups
\ No newline at end of file