diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
index 469a6ed9e1d..39935b7d519 100644
--- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -885,19 +885,19 @@ Not everything needs to be implemented for ocis. While the oc10 testsuite covers
 - [coreApiTrashbin/trashbinFilesFolders.feature:100](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L100)
 - [coreApiTrashbin/trashbinFilesFolders.feature:136](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L136)
 - [coreApiTrashbin/trashbinFilesFolders.feature:159](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L159)
+- [coreApiTrashbin/trashbinFilesFolders.feature:322](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L322)
 - [coreApiTrashbin/trashbinFilesFolders.feature:323](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L323)
 - [coreApiTrashbin/trashbinFilesFolders.feature:324](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L324)
-- [coreApiTrashbin/trashbinFilesFolders.feature:325](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L325)
+- [coreApiTrashbin/trashbinFilesFolders.feature:329](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L329)
 - [coreApiTrashbin/trashbinFilesFolders.feature:330](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L330)
 - [coreApiTrashbin/trashbinFilesFolders.feature:331](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L331)
 - [coreApiTrashbin/trashbinFilesFolders.feature:332](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L332)
 - [coreApiTrashbin/trashbinFilesFolders.feature:333](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L333)
 - [coreApiTrashbin/trashbinFilesFolders.feature:334](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L334)
-- [coreApiTrashbin/trashbinFilesFolders.feature:335](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L335)
-- [coreApiTrashbin/trashbinFilesFolders.feature:352](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L352)
-- [coreApiTrashbin/trashbinFilesFolders.feature:372](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L372)
-- [coreApiTrashbin/trashbinFilesFolders.feature:426](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L426)
-- [coreApiTrashbin/trashbinFilesFolders.feature:463](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L463)
+- [coreApiTrashbin/trashbinFilesFolders.feature:351](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L351)
+- [coreApiTrashbin/trashbinFilesFolders.feature:371](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L371)
+- [coreApiTrashbin/trashbinFilesFolders.feature:425](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L425)
+- [coreApiTrashbin/trashbinFilesFolders.feature:462](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L462)
 
 #### [Default capabilities for normal user and admin user not same as in oC-core](https://github.com/owncloud/ocis/issues/1285)
 - [coreApiCapabilities/capabilities.feature:8](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiCapabilities/capabilities.feature#L8)
diff --git a/tests/acceptance/features/bootstrap/OccContext.php b/tests/acceptance/features/bootstrap/OccContext.php
index 88e90977f92..0e5bf659c7f 100644
--- a/tests/acceptance/features/bootstrap/OccContext.php
+++ b/tests/acceptance/features/bootstrap/OccContext.php
@@ -543,49 +543,6 @@ public function listLocalStorageShowPassword():void {
 		$this->invokingTheCommand('files_external:list --show-password --output=json');
 	}
 
-	/**
-	 * @When /^the administrator invokes occ command "([^"]*)"$/
-	 *
-	 * @param string $cmd
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function theAdministratorInvokesOccCommand(string $cmd):void {
-		$this->invokingTheCommand($cmd);
-	}
-
-	/**
-	 * @When /^the administrator invokes occ command "([^"]*)" for user "([^"]*)"$/
-	 *
-	 * @param string $cmd
-	 * @param string $user
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function theAdministratorInvokesOccCommandForUser(string $cmd, string $user):void {
-		$user = $this->featureContext->getActualUsername($user);
-		$cmd = $this->featureContext->substituteInLineCodes(
-			$cmd,
-			$user
-		);
-		$this->invokingTheCommand($cmd);
-	}
-
-	/**
-	 * @Given /^the administrator has invoked occ command "([^"]*)"$/
-	 *
-	 * @param string $cmd
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function theAdministratorHasInvokedOccCommand(string $cmd):void {
-		$this->invokingTheCommand($cmd);
-		$this->theCommandShouldHaveBeenSuccessful();
-	}
-
 	/**
 	 * @Given the administrator has selected master key encryption type using the occ command
 	 *
@@ -634,53 +591,6 @@ public function theAdministratorRemovesTheSecurityCertificate(string $certificat
 		\array_push($this->removedCertificates, $certificate);
 	}
 
-	/**
-	 * @When /^the administrator invokes occ command "([^"]*)" with environment variable "([^"]*)" set to "([^"]*)"$/
-	 *
-	 * @param string $cmd
-	 * @param string $envVariableName
-	 * @param string $envVariableValue
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function theAdministratorInvokesOccCommandWithEnvironmentVariable(
-		string $cmd,
-		string $envVariableName,
-		string $envVariableValue
-	):void {
-		$this->featureContext->setOccLastCode(
-			$this->invokingTheCommandWithEnvVariable(
-				$cmd,
-				$envVariableName,
-				$envVariableValue
-			)
-		);
-	}
-
-	/**
-	 * @Given /^the administrator has invoked occ command "([^"]*)" with environment variable "([^"]*)" set to "([^"]*)"$/
-	 *
-	 * @param string $cmd
-	 * @param string $envVariableName
-	 * @param string $envVariableValue
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function theAdministratorHasInvokedOccCommandWithEnvironmentVariable(
-		string $cmd,
-		string $envVariableName,
-		string $envVariableValue
-	):void {
-		$this->invokingTheCommandWithEnvVariable(
-			$cmd,
-			$envVariableName,
-			$envVariableValue
-		);
-		$this->theCommandShouldHaveBeenSuccessful();
-	}
-
 	/**
 	 * @When the administrator runs upgrade routines on local server using the occ command
 	 *
diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature
index 314d05acf3c..a1a8f04fb86 100644
--- a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature
+++ b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature
@@ -161,7 +161,6 @@ Feature: files and folders exist in the trashbin after being deleted
   @local_storage @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore
   Scenario Outline: Deleting a folder into external storage moves it to the trashbin
     Given using <dav-path> DAV path
-    And the administrator has invoked occ command "files:scan --all"
     And user "Alice" has created folder "/local_storage/tmp"
     And user "Alice" has moved file "/textfile0.txt" to "/local_storage/tmp/textfile0.txt"
     When user "Alice" deletes folder "/local_storage/tmp" using the WebDAV API
diff --git a/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature b/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature
index 05a1b50c9c3..cc5ba2002e8 100644
--- a/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature
+++ b/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature
@@ -133,7 +133,6 @@ Feature: Restore deleted files/folders
   @local_storage @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore
   Scenario Outline: Deleting a file into external storage moves it to the trashbin and can be restored
     Given using <dav-path> DAV path
-    And the administrator has invoked occ command "files:scan --all"
     And user "Alice" has created folder "/local_storage/tmp"
     And user "Alice" has moved file "/textfile0.txt" to "/local_storage/tmp/textfile0.txt"
     And user "Alice" has deleted file "/local_storage/tmp/textfile0.txt"
@@ -156,7 +155,6 @@ Feature: Restore deleted files/folders
   @local_storage @files_external-app-required @skipOnEncryptionType:user-keys @encryption-issue-42 @skip_on_objectstore
   Scenario: Deleting an updated file into external storage moves it to the trashbin and can be restored
     Given using old DAV path
-    And the administrator has invoked occ command "files:scan --all"
     And user "Alice" has created folder "/local_storage/tmp"
     And user "Alice" has moved file "/textfile0.txt" to "/local_storage/tmp/textfile0.txt"
     And user "Alice" has uploaded chunk file "1" of "1" with "AA" to "/local_storage/tmp/textfile0.txt"