diff --git a/.drone.star b/.drone.star
index 881106ef0..597915d22 100644
--- a/.drone.star
+++ b/.drone.star
@@ -962,7 +962,7 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4):
 
 def coreApiTests(ctx, part_number = 1, number_of_parts = 1, storage = "ocis", accounts_hash_difficulty = 4):
     early_fail = config["apiTests"]["earlyFail"] if "earlyFail" in config["apiTests"] else False
-    filterTags = "~@skipOnGraph&&~@skipOnOcis-%s-Storage&&~@caldav&&~@carddav" % ("OC" if storage == "owncloud" else "OCIS")
+    filterTags = "~@skipOnGraph&&~@skipOnOcis-%s-Storage&&~@carddav" % ("OC" if storage == "owncloud" else "OCIS")
     expectedFailuresFile = "%s/tests/acceptance/expected-failures-API-on-%s-storage.md" % (dirs["base"], storage.upper())
 
     return {
diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
index 24cda1c06..fba28f950 100644
--- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -710,19 +710,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: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:305](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L305)
+- [coreApiTrashbin/trashbinFilesFolders.feature:306](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L306)
+- [coreApiTrashbin/trashbinFilesFolders.feature:307](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L307)
+- [coreApiTrashbin/trashbinFilesFolders.feature:312](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L312)
+- [coreApiTrashbin/trashbinFilesFolders.feature:313](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L313)
+- [coreApiTrashbin/trashbinFilesFolders.feature:314](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L314)
+- [coreApiTrashbin/trashbinFilesFolders.feature:315](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L315)
+- [coreApiTrashbin/trashbinFilesFolders.feature:316](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L316)
+- [coreApiTrashbin/trashbinFilesFolders.feature:317](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L317)
 - [coreApiTrashbin/trashbinFilesFolders.feature:334](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L334)
-- [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)
+- [coreApiTrashbin/trashbinFilesFolders.feature:354](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L354)
+- [coreApiTrashbin/trashbinFilesFolders.feature:408](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L408)
+- [coreApiTrashbin/trashbinFilesFolders.feature:445](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature#L445)
 
 #### [Default capabilities for normal user and admin user not same as in oC-core](https://github.com/owncloud/ocis/issues/1285)
 - [coreApiCapabilities/capabilities.feature:11](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiCapabilities/capabilities.feature#L11)
diff --git a/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature b/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature
index 3d4c1aad8..4045ef9c1 100644
--- a/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature
+++ b/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnReva
+@api @skipOnReva
 Feature: sharing
   As a user
   I want to be able to share files when passwords are stored with the full hash difficulty
diff --git a/tests/acceptance/features/apiSpacesShares/checksum.feature b/tests/acceptance/features/apiSpacesShares/checksum.feature
index c5c870e3b..fe0a78ff8 100644
--- a/tests/acceptance/features/apiSpacesShares/checksum.feature
+++ b/tests/acceptance/features/apiSpacesShares/checksum.feature
@@ -10,7 +10,7 @@ Feature: checksums
     And using spaces DAV path
     And user "Brian" has been created with default attributes and without skeleton files
 
-  @files_sharing-app-required @issue-1291
+  @issue-1291
   Scenario: sharing a file with checksum should return the checksum in the propfind using new DAV path
     Given user "Alice" has uploaded file "filesForUpload/textfile.txt" to "/myChecksumFile.txt" with checksum "MD5:d70b40f177b14b470d1756a3c12b963a"
     And user "Alice" has shared file "/myChecksumFile.txt" with user "Brian"
@@ -19,7 +19,7 @@ Feature: checksums
     Then the HTTP status code should be "207"
     And the webdav checksum should match "SHA1:3ee962b839762adb0ad8ba6023a4690be478de6f MD5:d70b40f177b14b470d1756a3c12b963a ADLER32:8ae90960"
 
-  @files_sharing-app-required @issue-1291
+  @issue-1291
   Scenario: modifying a shared file should return correct checksum in the propfind using new DAV path
     Given user "Alice" has uploaded file "filesForUpload/textfile.txt" to "/myChecksumFile.txt" with checksum "MD5:d70b40f177b14b470d1756a3c12b963a"
     And user "Alice" has shared file "/myChecksumFile.txt" with user "Brian"
diff --git a/tests/acceptance/features/bootstrap/FeatureContext.php b/tests/acceptance/features/bootstrap/FeatureContext.php
index ca96ec20d..254c89a60 100644
--- a/tests/acceptance/features/bootstrap/FeatureContext.php
+++ b/tests/acceptance/features/bootstrap/FeatureContext.php
@@ -1867,40 +1867,6 @@ class FeatureContext extends BehatVariablesContext {
 		);
 	}
 
-	/**
-	 * @Given file :filename with text :text has been created in local storage on the server
-	 *
-	 * @param string $filename
-	 * @param string $text
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function fileHasBeenCreatedInLocalStorageWithText(string $filename, string $text): void {
-		$this->createFileOnServerWithContent(
-			LOCAL_STORAGE_DIR_ON_REMOTE_SERVER . "/$filename",
-			$text
-		);
-	}
-
-	/**
-	 * @Given file :filename has been deleted from local storage on the server
-	 *
-	 * @param string $filename
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function fileHasBeenDeletedInLocalStorage(string $filename): void {
-		SetupHelper::deleteFileOnServer(
-			LOCAL_STORAGE_DIR_ON_REMOTE_SERVER . "/$filename",
-			$this->getStepLineRef(),
-			$this->getBaseUrl(),
-			$this->getAdminUsername(),
-			$this->getAdminPassword()
-		);
-	}
-
 	/**
 	 * @param string $user
 	 *
@@ -2185,83 +2151,6 @@ class FeatureContext extends BehatVariablesContext {
 		$this->response = $this->getStatusPhp();
 	}
 
-	/**
-	 * @When the administrator creates file :path with content :content in local storage using the testing API
-	 *
-	 * @param string $path
-	 * @param string $content
-	 *
-	 * @return void
-	 */
-	public function theAdministratorCreatesFileUsingTheTestingApi(string $path, string $content): void {
-		$this->theAdministratorCreatesFileWithContentInLocalStorageUsingTheTestingApi(
-			$path,
-			$content,
-			'local_storage'
-		);
-	}
-
-	/**
-	 * @Given the administrator has created file :path with content :content in local storage using the testing API
-	 *
-	 * @param string $path
-	 * @param string $content
-	 *
-	 * @return void
-	 */
-	public function theAdministratorHasCreatedFileUsingTheTestingApi(string $path, string $content): void {
-		$this->theAdministratorHasCreatedFileWithContentInLocalStorageUsingTheTestingApi(
-			$path,
-			$content,
-			'local_storage'
-		);
-	}
-
-	/**
-	 * @When the administrator creates file :path with content :content in local storage :mountPoint using the testing API
-	 *
-	 * @param string $path
-	 * @param string $content
-	 * @param string $mountPoint
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function theAdministratorCreatesFileWithContentInLocalStorageUsingTheTestingApi(
-		string $path,
-		string $content,
-		string $mountPoint
-	): void {
-		$response = $this->copyContentToFileInTemporaryStorageOnSystemUnderTest(
-			"$mountPoint/$path",
-			$content
-		);
-		$this->setResponse($response);
-	}
-
-	/**
-	 * @Given the administrator has created file :path with content :content in local storage :mountPoint
-	 *
-	 * @param string $path
-	 * @param string $content
-	 * @param string $mountPoint
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function theAdministratorHasCreatedFileWithContentInLocalStorageUsingTheTestingApi(
-		string $path,
-		string $content,
-		string $mountPoint
-	): void {
-		$this->theAdministratorCreatesFileWithContentInLocalStorageUsingTheTestingApi(
-			$path,
-			$content,
-			$mountPoint
-		);
-		$this->theHTTPStatusCodeShouldBeSuccess();
-	}
-
 	/**
 	 * Copy a file from the test-runner to the temporary storage directory on
 	 * the system-under-test. This uses the testing app to push the file into
@@ -2321,28 +2210,6 @@ class FeatureContext extends BehatVariablesContext {
 		);
 	}
 
-	/**
-	 * @When the administrator deletes file :path in local storage using the testing API
-	 *
-	 * @param string $path
-	 *
-	 * @return void
-	 */
-	public function theAdministratorDeletesFileInLocalStorageUsingTheTestingApi(string $path): void {
-		$user = $this->getAdminUsername();
-		$response = OcsApiHelper::sendRequest(
-			$this->getBaseUrl(),
-			$user,
-			$this->getAdminPassword(),
-			'DELETE',
-			"/apps/testing/api/v1/file",
-			$this->getStepLineRef(),
-			['file' => LOCAL_STORAGE_DIR_ON_REMOTE_SERVER . "/$path"],
-			$this->getOcsApiVersion()
-		);
-		$this->setResponse($response);
-	}
-
 	/**
 	 * @Given a file with the size of :size bytes and the name :name has been created locally
 	 *
@@ -2612,21 +2479,6 @@ class FeatureContext extends BehatVariablesContext {
 		$this->setResponse($response);
 	}
 
-	/**
-	 * @When the local storage mount for :mount is renamed to :target
-	 *
-	 * @param string $mount
-	 * @param string $target
-	 *
-	 * @return void
-	 */
-	public function theLocalStorageMountForIsRenamedTo(string $mount, string $target): void {
-		$mountPath = TEMPORARY_STORAGE_DIR_ON_REMOTE_SERVER . "/" . ltrim($mount, '/');
-		$targetPath = TEMPORARY_STORAGE_DIR_ON_REMOTE_SERVER . "/" . ltrim($target, '/');
-
-		$this->moveFileInServerRoot($mountPath, $targetPath);
-	}
-
 	/**
 	 * @Then the file :path with content :content should exist in the server root
 	 *
diff --git a/tests/acceptance/features/bootstrap/bootstrap.php b/tests/acceptance/features/bootstrap/bootstrap.php
index fc5815031..7eac6e5e6 100644
--- a/tests/acceptance/features/bootstrap/bootstrap.php
+++ b/tests/acceptance/features/bootstrap/bootstrap.php
@@ -91,9 +91,3 @@ if (!\defined('ACCEPTANCE_TEST_DIR_ON_REMOTE_SERVER')) {
 if (!\defined('TEMPORARY_STORAGE_DIR_ON_REMOTE_SERVER')) {
 	\define('TEMPORARY_STORAGE_DIR_ON_REMOTE_SERVER', ACCEPTANCE_TEST_DIR_ON_REMOTE_SERVER . '/server_tmp');
 }
-
-// The following directory is created, used, and deleted by tests that need to
-// use some "local external storage" on the server.
-if (!\defined('LOCAL_STORAGE_DIR_ON_REMOTE_SERVER')) {
-	\define('LOCAL_STORAGE_DIR_ON_REMOTE_SERVER', TEMPORARY_STORAGE_DIR_ON_REMOTE_SERVER . '/local_storage');
-}
diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsDELETEAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsDELETEAuth.feature
index b0964f3af..364fb27e8 100644
--- a/tests/acceptance/features/coreApiAuthOcs/ocsDELETEAuth.feature
+++ b/tests/acceptance/features/coreApiAuthOcs/ocsDELETEAuth.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: auth
   As a user
   I want to send delete request with wrong password
diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsGETAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsGETAuth.feature
index 5f8a6cf12..791900667 100644
--- a/tests/acceptance/features/coreApiAuthOcs/ocsGETAuth.feature
+++ b/tests/acceptance/features/coreApiAuthOcs/ocsGETAuth.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: auth
   As a user
   I want to send GET request to various endpoints
diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsPOSTAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsPOSTAuth.feature
index 58acdab38..c7c8e46fb 100644
--- a/tests/acceptance/features/coreApiAuthOcs/ocsPOSTAuth.feature
+++ b/tests/acceptance/features/coreApiAuthOcs/ocsPOSTAuth.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: auth
   As a user
   I want to send POST request to various endpoints
diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsPUTAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsPUTAuth.feature
index d0de79637..e979b30d5 100644
--- a/tests/acceptance/features/coreApiAuthOcs/ocsPUTAuth.feature
+++ b/tests/acceptance/features/coreApiAuthOcs/ocsPUTAuth.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: auth
   As a user
   I want to send PUT request to various endpoints
diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature
index c1f5cd33f..156cb0d58 100644
--- a/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature
+++ b/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature
@@ -1,4 +1,4 @@
-@api .10.0
+@api
 Feature: make webdav request with special urls
   As a user
   I want to make webdav request with special urls
diff --git a/tests/acceptance/features/coreApiCapabilities/capabilities.feature b/tests/acceptance/features/coreApiCapabilities/capabilities.feature
index 1c895f22e..cbca7897d 100644
--- a/tests/acceptance/features/coreApiCapabilities/capabilities.feature
+++ b/tests/acceptance/features/coreApiCapabilities/capabilities.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: capabilities
   As an admin
   I want to list the capabilities
diff --git a/tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature b/tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature
index 7d76993b3..151bb7601 100644
--- a/tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature
+++ b/tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: default capabilities for normal user
   As a user
   I want to list capabilities
diff --git a/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature b/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature
index 67504e83e..7defe2895 100644
--- a/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature
+++ b/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: favorite
   As a user
   I want to favorite the shared resources
diff --git a/tests/acceptance/features/coreApiMain/checksums.feature b/tests/acceptance/features/coreApiMain/checksums.feature
index 6fb32e05c..1bbd38966 100644
--- a/tests/acceptance/features/coreApiMain/checksums.feature
+++ b/tests/acceptance/features/coreApiMain/checksums.feature
@@ -175,7 +175,7 @@ Feature: checksums
       | dav_version |
       | spaces      |
 
-  @files_sharing-app-required @issue-1291
+  @issue-1291
   Scenario Outline: sharing a file with checksum should return the checksum in the propfind using new DAV path
     Given auto-accept shares has been disabled
     And using <dav_version> DAV path
@@ -190,7 +190,7 @@ Feature: checksums
       | dav_version |
       | new         |
 
-  @files_sharing-app-required @issue-1291
+  @issue-1291
   Scenario Outline: modifying a shared file should return correct checksum in the propfind using new DAV path
     Given auto-accept shares has been disabled
     And using <dav_version> DAV path
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature
index ac6e6becc..e9b8939bf 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: Sharing resources with different case names with the sharee and checking the coexistence of resources on sharee/receivers side
   As a user
   I want to share resources with case sensitive names
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature
index 85a8f9004..883a31e80 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: resources shared with the same name are received with unique names
   As a user
   I want to share resources with same name
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature
index 3d2b7d2f4..77559e7c1 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1327
+@api @issue-1327
 Feature: shares are received in the default folder for received shares
   As a user
   I want to share the default Shares folder
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature
index 61c348884..816e884af 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: sharing works when a username and group name are the same
   As a user
   I want to share resources with group and users having same name
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature
index 6f097e82a..da748c232 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: share resources where the sharee receives the share in multiple ways
   As a user
   I want to receives the same resource share from multiple channels
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature
index 6b63881b6..3d4be97ec 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1328
+@api @issue-1328
 Feature: share resources with a disabled user
   As a user
   I want to share resources to disabled user
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature
index dc77eb22f..c4629b459 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: cannot share resources with invalid permissions
   As a user
   I want to share resources with invalid permission
diff --git a/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature b/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature
index a48793c1f..654fb3daa 100644
--- a/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature
+++ b/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: sharing
   As a user
   I want to share resources to others
diff --git a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature
index 134ef48a6..8a4641210 100644
--- a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature
+++ b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1328 @issue-1289
+@api @issue-1328 @issue-1289
 Feature: sharing
   As a user
   I want to delete shares
diff --git a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature
index 0d5ebb410..cb2e80125 100644
--- a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature
+++ b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1289 @issue-1328
+@api @issue-1289 @issue-1328
 Feature: accept/decline shares coming from internal users
   As a user
   I want to have control of which received shares I accept
diff --git a/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature b/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature
index 488e262c0..b6e2d2085 100644
--- a/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature
+++ b/tests/acceptance/features/coreApiShareManagementToShares/acceptSharesToSharesFolder.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: accept/decline shares coming from internal users to the Shares folder
   As a user
   I want to have control of which received shares I accept
diff --git a/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature
index e50e49e31..9d1fc5d65 100644
--- a/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature
+++ b/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1328 @issues-1289
+@api @issue-1328 @issues-1289
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature
index 39189ee18..486481650 100644
--- a/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature
+++ b/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1289 @issue-1328
+@api @issue-1289 @issue-1328
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature
index ab6ab6777..1f4be2754 100644
--- a/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature
+++ b/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: moving a share inside another share
   As a user
   I want to move a shared resource inside another shared resource
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature
index 463d0b38d..dcc64d389 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature
index ca9c696b7..3749136b8 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1289 @issue-1328
+@api @issue-1289 @issue-1328
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature
index 4192d6740..f22e74c89 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature
index d5576bdf1..d9a6b7283 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: get the pending shares filtered by type (user, group etc)
   As a user
   I want to be able to know the pending shares that I have received of a particular type (user, group etc)
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature
index b30e51780..7fe4d6504 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: get the received shares filtered by type (user, group etc)
   As a user
   I want to be able to know the shares that I have received of a particular type (user, group etc)
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature
index 5914feb0d..ec0205aae 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: get the received shares filtered by type (user, group etc)
   As a user
   I want to be able to know the shares that I have received of a particular type (user, group etc)
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature
index eeb63bd4a..af7ba6f9d 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: get shares filtered by type (user, group etc)
   As a user
   I want to be able to know the shares that I have made of a particular type (user, group etc)
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFilteredEmpty.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFilteredEmpty.feature
index 9baa881e4..2ac882dbd 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFilteredEmpty.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFilteredEmpty.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: get shares filtered by type (user, group etc)
   As a user
   I want to be able to know the shares that I have made of a particular type (user, group etc)
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature b/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature
index a80ab9a10..0945bb048 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature b/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature
index aea0625a8..07a79e817 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: share access by ID
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature
index 73f63c38b..77bee1d90 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiSharePublicLink1/accessToPublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink1/accessToPublicLinkShare.feature
index 24f6969c4..8d7c15ba7 100644
--- a/tests/acceptance/features/coreApiSharePublicLink1/accessToPublicLinkShare.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink1/accessToPublicLinkShare.feature
@@ -1,4 +1,4 @@
-@api @public_link_share-feature-required @files_sharing-app-required
+@api @public_link_share-feature-required
 Feature: accessing a public link share
 
   Background:
diff --git a/tests/acceptance/features/coreApiSharePublicLink1/changingPublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink1/changingPublicLinkShare.feature
index 95f5c0e95..b3911bdc0 100644
--- a/tests/acceptance/features/coreApiSharePublicLink1/changingPublicLinkShare.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink1/changingPublicLinkShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @public_link_share-feature-required @issue-1276 @issue-1277 @issue-2079 @issue-1269
+@api @public_link_share-feature-required @issue-1276 @issue-1277 @issue-2079 @issue-1269
 
 Feature: changing a public link share
 
diff --git a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature
index 165204638..8e4919acd 100644
--- a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @public_link_share-feature-required @issue-1276 @issue-1277
+@api @public_link_share-feature-required @issue-1276 @issue-1277
 
 Feature: create a public link share
 
diff --git a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature
index 6f6891fad..51eb86c31 100644
--- a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @public_link_share-feature-required
+@api @public_link_share-feature-required
 Feature: create a public link share when share_folder is set to Shares
 
   Background:
diff --git a/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature b/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature
index 02ee80257..60ca10132 100644
--- a/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink2/copyFromPublicLink.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @public_link_share-feature-required
+@api @public_link_share-feature-required
 Feature: copying from public link share
 
   Background:
diff --git a/tests/acceptance/features/coreApiSharePublicLink2/multilinkSharing.feature b/tests/acceptance/features/coreApiSharePublicLink2/multilinkSharing.feature
index a76cf3bba..dd6d68c18 100644
--- a/tests/acceptance/features/coreApiSharePublicLink2/multilinkSharing.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink2/multilinkSharing.feature
@@ -1,4 +1,4 @@
-@api @public_link_share-feature-required @files_sharing-app-required
+@api @public_link_share-feature-required
 Feature: multilinksharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature b/tests/acceptance/features/coreApiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature
index a0857b21a..d06952d40 100644
--- a/tests/acceptance/features/coreApiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @public_link_share-feature-required
+@api @public_link_share-feature-required
 Feature: reshare as public link
   As a user
   I want to create public link shares from files/folders shared with me
diff --git a/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature
index f4b8be6c6..e3c32cd8b 100644
--- a/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @public_link_share-feature-required
+@api @public_link_share-feature-required
 Feature: update a public link share
 
   Background:
diff --git a/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature
index 91ac668d3..7c35754b6 100644
--- a/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink3/uploadToPublicLinkShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @public_link_share-feature-required @issue-1276 @issue-1277 @issue-2079
+@api @public_link_share-feature-required @issue-1276 @issue-1277 @issue-2079
 
 Feature: upload to a public link share
 
diff --git a/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature b/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature
index 7899c9e10..9cfc6562c 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1328
+@api @issue-1328
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature b/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature
index f81eae4ae..f91afa8a1 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-2141
+@api @issue-2141
 Feature: resharing can be done on a reshared resource
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature b/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature
index a9781f79a..35870cdda 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1328
+@api @issue-1328
 Feature: resharing can be disabled
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature b/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature
index 27d709124..2e4dc821c 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1328
+@api @issue-1328
 Feature: a subfolder of a received share can be reshared
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature b/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature
index f7ebf2d1f..9e70ae3c0 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1328
+@api @issue-1328
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature b/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature
index 3c178d8c4..fa695e3bc 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1328
+@api @issue-1328
 Feature: resharing a resource with an expiration date
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature b/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature
index e7ddb0699..95bb8f396 100644
--- a/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature
+++ b/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: sharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature b/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature
index 3a18e07f6..9d193353f 100644
--- a/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature
+++ b/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @issue-1289 @issue-1328
+@api @issue-1289 @issue-1328
 Feature: updating shares to users and groups that have the same name
 
   Background:
diff --git a/tests/acceptance/features/coreApiSharees/sharees.feature b/tests/acceptance/features/coreApiSharees/sharees.feature
index 2cffeffcd..ffe96577d 100644
--- a/tests/acceptance/features/coreApiSharees/sharees.feature
+++ b/tests/acceptance/features/coreApiSharees/sharees.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required
+@api
 Feature: search sharees
   As a user
   I want to search sharees
diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature
index 24005c2b4..a056f2ab9 100644
--- a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature
+++ b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature
@@ -59,7 +59,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | spaces   |
 
-  @files_sharing-app-required
+
   Scenario Outline: deleting a file in a shared folder moves it to the trashbin root
     Given using <dav-path> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -80,7 +80,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | spaces   |
 
-  @files_sharing-app-required
+
   Scenario Outline: deleting a shared folder moves it to trashbin
     Given using <dav-path> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -158,23 +158,6 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | spaces   |
 
-  @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 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
-    Then the HTTP status code should be "204"
-    And as "Alice" the folder with original path "/local_storage/tmp" should exist in the trashbin
-    Examples:
-      | dav-path |
-      | new      |
-
-    @personalSpace
-    Examples:
-      | dav-path |
-      | spaces   |
-
   @issue-3561 @skipOnLDAP @skip_on_objectstore
   Scenario Outline: Listing other user's trashbin is prohibited
     Given using <dav-path> DAV path
diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature b/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature
index e89d9d93e..60b906709 100644
--- a/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature
+++ b/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature
@@ -1,4 +1,4 @@
-@api @files_trashbin-app-required @files_sharing-app-required
+@api @files_trashbin-app-required
 Feature: using trashbin together with sharing
 
   Background:
diff --git a/tests/acceptance/features/coreApiVersions/fileVersions.feature b/tests/acceptance/features/coreApiVersions/fileVersions.feature
index 6cb5e8300..b9ff76525 100644
--- a/tests/acceptance/features/coreApiVersions/fileVersions.feature
+++ b/tests/acceptance/features/coreApiVersions/fileVersions.feature
@@ -272,7 +272,7 @@ Feature: dav-versions
     Then the HTTP status code should be "204"
     And the version folder of file "/file.txt" for user "Alice" should contain "0" element
 
-  @files_sharing-app-required
+ 
   Scenario: sharer of a file can see the old version information when the sharee changes the content of the file
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "First content" to "sharefile.txt"
@@ -284,7 +284,7 @@ Feature: dav-versions
     When user "Brian" gets the number of versions of file "/Shares/sharefile.txt"
     Then the HTTP status code should be "403"
 
-  @files_sharing-app-required
+ 
   Scenario: sharer of a file can restore the original content of a shared file after the file has been modified by the sharee
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "First content" to "sharefile.txt"
@@ -296,7 +296,7 @@ Feature: dav-versions
     And the content of file "/sharefile.txt" for user "Alice" should be "First content"
     And the content of file "/Shares/sharefile.txt" for user "Brian" should be "First content"
 
-  @files_sharing-app-required
+ 
   Scenario: sharer can restore a file inside a shared folder modified by sharee
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -309,7 +309,7 @@ Feature: dav-versions
     And the content of file "/sharingfolder/sharefile.txt" for user "Alice" should be "First content"
     And the content of file "/Shares/sharingfolder/sharefile.txt" for user "Brian" should be "First content"
 
-  @files_sharing-app-required
+ 
   Scenario: sharee cannot see a version of a file inside a shared folder when modified by sharee
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -322,7 +322,7 @@ Feature: dav-versions
     And the content of file "/Shares/sharingfolder/sharefile.txt" for user "Brian" should be "Second content"
     And the content of file "/sharingfolder/sharefile.txt" for user "Alice" should be "Second content"
 
-  @files_sharing-app-required
+ 
   Scenario: sharer can restore a file inside a shared folder created by sharee and modified by sharer
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -335,7 +335,7 @@ Feature: dav-versions
     And the content of file "/sharingfolder/sharefile.txt" for user "Alice" should be "First content"
     And the content of file "/Shares/sharingfolder/sharefile.txt" for user "Brian" should be "First content"
 
-  @files_sharing-app-required
+ 
   Scenario: sharer can restore a file inside a shared folder created by sharee and modified by sharee
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/sharingfolder"
@@ -348,7 +348,7 @@ Feature: dav-versions
     And the content of file "/sharingfolder/sharefile.txt" for user "Alice" should be "old content"
     And the content of file "/Shares/sharingfolder/sharefile.txt" for user "Brian" should be "old content"
 
-  @files_sharing-app-required
+ 
   Scenario: sharer can restore a file inside a group shared folder modified by sharee
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Carol" has been created with default attributes and without skeleton files
@@ -368,7 +368,7 @@ Feature: dav-versions
     And the content of file "/Shares/sharingfolder/sharefile.txt" for user "Brian" should be "First content"
     And the content of file "/Shares/sharingfolder/sharefile.txt" for user "Carol" should be "First content"
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Moving a file (with versions) into a shared folder as the sharee and as the sharer
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -393,7 +393,7 @@ Feature: dav-versions
       | old         | Brian | /testshare        |
       | new         | Brian | /testshare        |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Moving a file (with versions) out of a shared folder as the sharee and as the sharer
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -418,7 +418,7 @@ Feature: dav-versions
       | old         | Brian | /testshare |
       | new         | Brian | /testshare |
 
-  @files_sharing-app-required
+ 
   Scenario: Receiver tries to get file versions of unshared file from the sharer
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "textfile0" to "textfile0.txt"
@@ -429,7 +429,7 @@ Feature: dav-versions
     Then the HTTP status code should be "404"
     And the value of the item "//s:exception" in the response about user "Alice" should be "Sabre\DAV\Exception\NotFound"
 
-  @skipOnStorage:ceph @files_primary_s3-issue-161 @files_sharing-app-required
+  @skipOnStorage:ceph @files_primary_s3-issue-161
   Scenario: Receiver tries get file versions of shared file from the sharer
     Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "textfile0" to "textfile0.txt"
diff --git a/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature b/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature
index f8e185aba..6b1a9ca2f 100644
--- a/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature
+++ b/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature
@@ -27,7 +27,7 @@ Feature: there can be only one exclusive lock on a resource
       | spaces   | shared     |
       | spaces   | exclusive  |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: a share receiver cannot lock a resource exclusively locked by itself
     Given using <dav-path> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -54,7 +54,7 @@ Feature: there can be only one exclusive lock on a resource
       | spaces   | shared     |
       | spaces   | exclusive  |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: a share receiver cannot lock a resource exclusively locked by the owner
     Given using <dav-path> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -81,7 +81,7 @@ Feature: there can be only one exclusive lock on a resource
       | spaces   | shared     |
       | spaces   | exclusive  |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: a share owner cannot lock a resource exclusively locked by a share receiver
     Given using <dav-path> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
diff --git a/tests/acceptance/features/coreApiWebdavLocks/requestsWithToken.feature b/tests/acceptance/features/coreApiWebdavLocks/requestsWithToken.feature
index bd3069209..5290ae517 100644
--- a/tests/acceptance/features/coreApiWebdavLocks/requestsWithToken.feature
+++ b/tests/acceptance/features/coreApiWebdavLocks/requestsWithToken.feature
@@ -4,7 +4,7 @@ Feature: actions on a locked item are possible if the token is sent with the req
   Background:
     Given user "Alice" has been created with default attributes and without skeleton files
 
-  @files_sharing-app-required
+ 
   Scenario Outline: two users having both a shared lock can use the resource
     Given using <dav-path> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
diff --git a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature
index e2f0e2366..d300715ba 100644
--- a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature
+++ b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature
@@ -25,7 +25,7 @@ Feature: UNLOCK locked items
       | dav-path |
       | spaces   |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: as public unlocking a file in a share that was locked by the file owner is not possible. To unlock use the owners locktoken
     Given user "Alice" has created folder "PARENT"
     And user "Alice" has uploaded file "filesForUpload/textfile.txt" to "PARENT/parent.txt"
diff --git a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature
index f99351855..f439cb98e 100644
--- a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature
+++ b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature
@@ -1,4 +1,4 @@
-@api @issue-1284 @files_sharing-app-required
+@api @issue-1284
 Feature: UNLOCK locked items (sharing)
 
   Background:
diff --git a/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature b/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature
index 4d5979857..954a98a76 100644
--- a/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature
+++ b/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required 
+@api 
 Feature: move (rename) file
   As a user
   I want to be able to move and rename files
diff --git a/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature b/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature
index 6856a91f4..c3f3980c8 100644
--- a/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature
+++ b/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature
@@ -62,7 +62,7 @@ Feature: copy file
       | dav_version |
       | spaces      |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Copying a file to a folder with no permissions
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -81,7 +81,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Copying a file to overwrite a file into a folder with no permissions
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -618,7 +618,7 @@ Feature: copy file
       | dav_version |
       | spaces      |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Copying a file into a shared folder as the sharee
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -638,7 +638,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Copying a file into a shared folder as the sharer
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -659,7 +659,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Copying a file out of a shared folder as the sharee
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -681,7 +681,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Copying a file out of a shared folder as the sharer
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -730,7 +730,7 @@ Feature: copy file
       | dav_version |
       | spaces      |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Copying a file between shares received from different users
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -761,7 +761,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Copying a folder between shares received from different users
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -793,7 +793,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Copying a file to a folder that is shared with multiple users
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
diff --git a/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature b/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature
index 25e1016b3..b3272f69d 100644
--- a/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature
+++ b/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature
@@ -40,7 +40,7 @@ Feature: get quota
       | dav_version |
       | spaces      |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Retrieving folder quota of shared folder with quota when no quota is set for recipient
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and small skeleton files
@@ -87,7 +87,7 @@ Feature: get quota
       | dav_version |
       | spaces      |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: Retrieving folder quota when quota is set and a file was received
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and small skeleton files
diff --git a/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature b/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature
index 560a36788..0a6397bc7 100644
--- a/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature
+++ b/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature
@@ -60,7 +60,7 @@ Feature: set file properties
       | dav_version |
       | spaces      |
 
-  @files_sharing-app-required @issue-1297
+  @issue-1297
   Scenario Outline: Setting custom DAV property on a shared file as an owner and reading as a recipient
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
diff --git a/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature b/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature
index 129c37907..5cc992622 100644
--- a/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature
+++ b/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature
@@ -168,7 +168,7 @@ Feature: get file properties
       | dav_version |
       | spaces      |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: A file that is shared to a user has a share-types property
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
@@ -194,7 +194,7 @@ Feature: get file properties
       | dav_version |
       | spaces      |
 
-  @files_sharing-app-required
+ 
   Scenario Outline: A file that is shared to a group has a share-types property
     Given using <dav_version> DAV path
     And group "grp1" has been created
@@ -220,7 +220,7 @@ Feature: get file properties
       | dav_version |
       | spaces      |
 
-  @public_link_share-feature-required @files_sharing-app-required
+  @public_link_share-feature-required
   Scenario Outline: A file that is shared by link has a share-types property
     Given using <dav_version> DAV path
     And user "Alice" has created folder "/test"
@@ -243,7 +243,7 @@ Feature: get file properties
       | dav_version |
       | spaces      |
 
-  @skipOnLDAP @user_ldap-issue-268 @public_link_share-feature-required @files_sharing-app-required
+  @skipOnLDAP @user_ldap-issue-268 @public_link_share-feature-required
   Scenario Outline: A file that is shared by user,group and link has a share-types property
     Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature
index 258f1dd14..8704bc16a 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required 
+@api 
 Feature: upload file
   As a user
   I want the mtime of an uploaded file to be the creation date on upload source not the upload date
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature
index 1f81b2463..9e96c8bf1 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required 
+@api 
 
 Feature: upload file to shared folder