diff --git a/tests/acceptance/bootstrap/FeatureContext.php b/tests/acceptance/bootstrap/FeatureContext.php
index 5ccede0f15..09413a7b0c 100644
--- a/tests/acceptance/bootstrap/FeatureContext.php
+++ b/tests/acceptance/bootstrap/FeatureContext.php
@@ -2701,6 +2701,28 @@ class FeatureContext extends BehatVariablesContext {
 		}
 	}
 
+	/**
+	 * @AfterScenario
+	 *
+	 * @return void
+	 *
+	 * @throws Exception|GuzzleException
+	 */
+	public function cleanDataAfterTests(): void {
+		if (!OcHelper::isTestingOnReva() && !OcHelper::isUsingPreparedLdapUsers()) {
+			$this->spacesContext->deleteAllProjectSpaces();
+		}
+
+		if (OcHelper::isTestingOnReva()) {
+			OcHelper::deleteRevaUserData($this->getCreatedUsers());
+		}
+		if ($this->isTestingWithLdap()) {
+			$this->deleteLdapUsersAndGroups();
+		}
+		$this->cleanupDatabaseUsers();
+		$this->cleanupDatabaseGroups();
+	}
+
 	/**
 	 * @BeforeScenario @temporary_storage_on_server
 	 *
diff --git a/tests/acceptance/bootstrap/Provisioning.php b/tests/acceptance/bootstrap/Provisioning.php
index 4e5e53046b..6b48ac3fcd 100644
--- a/tests/acceptance/bootstrap/Provisioning.php
+++ b/tests/acceptance/bootstrap/Provisioning.php
@@ -1893,24 +1893,6 @@ trait Provisioning {
 		);
 	}
 
-	/**
-	 * @AfterScenario
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function afterScenario(): void {
-		if (OcHelper::isTestingOnReva()) {
-			OcHelper::deleteRevaUserData($this->getCreatedUsers());
-		}
-
-		if ($this->isTestingWithLdap()) {
-			$this->deleteLdapUsersAndGroups();
-		}
-		$this->cleanupDatabaseUsers();
-		$this->cleanupDatabaseGroups();
-	}
-
 	/**
 	 *
 	 * @return void
diff --git a/tests/acceptance/bootstrap/SpacesContext.php b/tests/acceptance/bootstrap/SpacesContext.php
index 515b197024..2554583b74 100644
--- a/tests/acceptance/bootstrap/SpacesContext.php
+++ b/tests/acceptance/bootstrap/SpacesContext.php
@@ -478,20 +478,6 @@ class SpacesContext implements Context {
 		$this->archiverContext = BehatHelper::getContext($scope, $environment, 'ArchiverContext');
 	}
 
-	/**
-	 * @AfterScenario
-	 *
-	 * @return void
-	 *
-	 * @throws Exception|GuzzleException
-	 */
-	public function cleanDataAfterTests(): void {
-		if (OcHelper::isTestingOnReva() || OcHelper::isUsingPreparedLdapUsers()) {
-			return;
-		}
-		$this->deleteAllProjectSpaces();
-	}
-
 	/**
 	 * the admin user first disables and then deletes spaces
 	 *