diff --git a/tests/acceptance/features/bootstrap/FeatureContext.php b/tests/acceptance/features/bootstrap/FeatureContext.php
index 3f8f2b44f..60d8a6d49 100644
--- a/tests/acceptance/features/bootstrap/FeatureContext.php
+++ b/tests/acceptance/features/bootstrap/FeatureContext.php
@@ -3222,20 +3222,23 @@ class FeatureContext extends BehatVariablesContext {
 		$this->ocsContext = new OCSContext();
 		$this->authContext = new AuthContext();
 		$this->appConfigurationContext = new AppConfigurationContext();
-		$this->spacesContext = new SpacesContext();
 		$this->ocsContext->before($scope);
 		$this->authContext->setUpScenario($scope);
 		$this->appConfigurationContext->setUpScenario($scope);
 		$environment->registerContext($this->ocsContext);
 		$environment->registerContext($this->authContext);
 		$environment->registerContext($this->appConfigurationContext);
-		$this->spacesContext->setUpScenario($scope);
-		$environment->registerContext($this->spacesContext);
 		$scenarioLine = $scope->getScenario()->getLine();
 		$featureFile = $scope->getFeature()->getFile();
 		$suiteName = $scope->getSuite()->getName();
 		$featureFileName = \basename($featureFile);
 
+		if (!OcisHelper::isTestingOnReva()) {
+			$this->spacesContext = new SpacesContext();
+			$this->spacesContext->setUpScenario($scope);
+			$environment->registerContext($this->spacesContext);
+		}
+
 		if ($this->sendScenarioLineReferencesInXRequestId()) {
 			$this->scenarioString = $suiteName . '/' . $featureFileName . ':' . $scenarioLine;
 		} else {