diff --git a/.drone.star b/.drone.star
index 3289e26b109..597915d22a1 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&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@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/docker/src/run-tests.sh b/tests/acceptance/docker/src/run-tests.sh
index b75649a179f..2c765589472 100644
--- a/tests/acceptance/docker/src/run-tests.sh
+++ b/tests/acceptance/docker/src/run-tests.sh
@@ -12,7 +12,7 @@ then
     if [ "$STORAGE_DRIVER" = "ocis" ]
     then
         export OCIS_REVA_DATA_ROOT=''
-        export BEHAT_FILTER_TAGS='~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage'
+        export BEHAT_FILTER_TAGS='~@skipOnOcis-OCIS-Storage'
         export OCIS_SKELETON_STRATEGY='upload'
         export EXPECTED_FAILURES_FILE='/drone/src/tests/acceptance/expected-failures-API-on-OCIS-storage.md'
     elif [ "$STORAGE_DRIVER" = "s3ng" ]
diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
index 24cda1c0615..fba28f950b8 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 3d4c1aad868..4045ef9c1dc 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/apiArchiver/downloadById.feature b/tests/acceptance/features/apiArchiver/downloadById.feature
index d02a58491f1..46f4187c8ee 100644
--- a/tests/acceptance/features/apiArchiver/downloadById.feature
+++ b/tests/acceptance/features/apiArchiver/downloadById.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: download multiple resources bundled into an archive
   As a user
   I want to be able to download multiple items at once
diff --git a/tests/acceptance/features/apiArchiver/downloadByPath.feature b/tests/acceptance/features/apiArchiver/downloadByPath.feature
index 9ca01286dcd..b33d802858b 100644
--- a/tests/acceptance/features/apiArchiver/downloadByPath.feature
+++ b/tests/acceptance/features/apiArchiver/downloadByPath.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: download multiple resources bundled into an archive
   As a user
   I want to be able to download multiple items at once
diff --git a/tests/acceptance/features/apiContract/copy.feature b/tests/acceptance/features/apiContract/copy.feature
index fe922fecc6a..54cf95f1bf0 100644
--- a/tests/acceptance/features/apiContract/copy.feature
+++ b/tests/acceptance/features/apiContract/copy.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Copy test
   As a user
   I want to check the PROPFIND response
diff --git a/tests/acceptance/features/apiContract/propfind.feature b/tests/acceptance/features/apiContract/propfind.feature
index 3b646c1185e..0033e51e3dc 100644
--- a/tests/acceptance/features/apiContract/propfind.feature
+++ b/tests/acceptance/features/apiContract/propfind.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Propfind test
   As a user
   I want to check the PROPFIND response
diff --git a/tests/acceptance/features/apiContract/spacesSharesReport.feature b/tests/acceptance/features/apiContract/spacesSharesReport.feature
index 0a75691d509..044d6711ed7 100644
--- a/tests/acceptance/features/apiContract/spacesSharesReport.feature
+++ b/tests/acceptance/features/apiContract/spacesSharesReport.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Report test
   As a user
   I want to check the share REPORT response
diff --git a/tests/acceptance/features/apiCors/cors.feature b/tests/acceptance/features/apiCors/cors.feature
index 63d3eebe92c..7521831a36b 100644
--- a/tests/acceptance/features/apiCors/cors.feature
+++ b/tests/acceptance/features/apiCors/cors.feature
@@ -1,6 +1,6 @@
 # NOTE: for running this feature locally, you need to run oCIS with the following env var:
 # CORS_ALLOWED_ORIGINS=https://aphno.badal
-@api @skipOnOcV10
+@api 
 Feature: CORS headers
   As a user
   I want to send a cross-origin request
diff --git a/tests/acceptance/features/apiGraph/addUserToGroup.feature b/tests/acceptance/features/apiGraph/addUserToGroup.feature
index 1d842f70423..e36599618ee 100644
--- a/tests/acceptance/features/apiGraph/addUserToGroup.feature
+++ b/tests/acceptance/features/apiGraph/addUserToGroup.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: add users to group
   As a admin
   I want to be able to add users to a group
diff --git a/tests/acceptance/features/apiGraph/createGroup.feature b/tests/acceptance/features/apiGraph/createGroup.feature
index 98b89d1e1be..b8263a10026 100644
--- a/tests/acceptance/features/apiGraph/createGroup.feature
+++ b/tests/acceptance/features/apiGraph/createGroup.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: create group
   As an admin
   I want to create a group
diff --git a/tests/acceptance/features/apiGraph/createUser.feature b/tests/acceptance/features/apiGraph/createUser.feature
index 83a50424ab1..2de93749daf 100644
--- a/tests/acceptance/features/apiGraph/createUser.feature
+++ b/tests/acceptance/features/apiGraph/createUser.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: create user
   As a admin
   I want to create a user
diff --git a/tests/acceptance/features/apiGraph/deleteGroup.feature b/tests/acceptance/features/apiGraph/deleteGroup.feature
index ff2ad6067a0..45c709012e3 100644
--- a/tests/acceptance/features/apiGraph/deleteGroup.feature
+++ b/tests/acceptance/features/apiGraph/deleteGroup.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: delete groups
   As an admin
   I want to be able to delete groups
diff --git a/tests/acceptance/features/apiGraph/deleteUser.feature b/tests/acceptance/features/apiGraph/deleteUser.feature
index 31789e09cf6..def4fd50fba 100644
--- a/tests/acceptance/features/apiGraph/deleteUser.feature
+++ b/tests/acceptance/features/apiGraph/deleteUser.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: delete user
   As an admin
   I want to be able to delete users
diff --git a/tests/acceptance/features/apiGraph/editGroup.feature b/tests/acceptance/features/apiGraph/editGroup.feature
index 7025a52c2f4..39e72941692 100644
--- a/tests/acceptance/features/apiGraph/editGroup.feature
+++ b/tests/acceptance/features/apiGraph/editGroup.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10 
+@api 
 Feature: edit group name
   As an admin
   I want to be able to edit group name
diff --git a/tests/acceptance/features/apiGraph/editUser.feature b/tests/acceptance/features/apiGraph/editUser.feature
index 810d5e5111b..e8803ecd462 100644
--- a/tests/acceptance/features/apiGraph/editUser.feature
+++ b/tests/acceptance/features/apiGraph/editUser.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: edit user
   As an admin
   I want to be able to edit user information
diff --git a/tests/acceptance/features/apiGraph/getApplications.feature b/tests/acceptance/features/apiGraph/getApplications.feature
index d1390b6412e..01f6beee261 100644
--- a/tests/acceptance/features/apiGraph/getApplications.feature
+++ b/tests/acceptance/features/apiGraph/getApplications.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10 @skipOnStable2.0
+@api @skipOnStable2.0
 Feature: get applications
   As a user
   I want to be able to get application information with existing roles
diff --git a/tests/acceptance/features/apiGraph/getGroup.feature b/tests/acceptance/features/apiGraph/getGroup.feature
index e03c7a01f29..bc0ea867e2f 100644
--- a/tests/acceptance/features/apiGraph/getGroup.feature
+++ b/tests/acceptance/features/apiGraph/getGroup.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: get groups and their members
   As an admin
   I want to be able to get groups
diff --git a/tests/acceptance/features/apiGraph/getUser.feature b/tests/acceptance/features/apiGraph/getUser.feature
index 3b509020dad..fb6031bebd9 100644
--- a/tests/acceptance/features/apiGraph/getUser.feature
+++ b/tests/acceptance/features/apiGraph/getUser.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: get users
   As an admin
   I want to be able to retrieve user information
diff --git a/tests/acceptance/features/apiGraph/getUserOwnInformation.feature b/tests/acceptance/features/apiGraph/getUserOwnInformation.feature
index 9ae09e4bbf1..ca872e11965 100644
--- a/tests/acceptance/features/apiGraph/getUserOwnInformation.feature
+++ b/tests/acceptance/features/apiGraph/getUserOwnInformation.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: get user's own information
   As user
   I want to be able to retrieve my own information
diff --git a/tests/acceptance/features/apiGraph/removeUserFromGroup.feature b/tests/acceptance/features/apiGraph/removeUserFromGroup.feature
index a1ed037f95f..45d51bac5af 100644
--- a/tests/acceptance/features/apiGraph/removeUserFromGroup.feature
+++ b/tests/acceptance/features/apiGraph/removeUserFromGroup.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: remove a user from a group
   As an admin
   I want to be able to remove a user from a group
diff --git a/tests/acceptance/features/apiSpaces/changeSpaces.feature b/tests/acceptance/features/apiSpaces/changeSpaces.feature
index de1bf54ad8c..0ef0dad59ee 100644
--- a/tests/acceptance/features/apiSpaces/changeSpaces.feature
+++ b/tests/acceptance/features/apiSpaces/changeSpaces.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Change data of space
   As a user with space admin rights
   I want to be able to change the meta-data of a created space (increase the quota, change name, etc.)
diff --git a/tests/acceptance/features/apiSpaces/disableAndDeleteSpaces.feature b/tests/acceptance/features/apiSpaces/disableAndDeleteSpaces.feature
index 5c3ccb78407..0ec12d75197 100644
--- a/tests/acceptance/features/apiSpaces/disableAndDeleteSpaces.feature
+++ b/tests/acceptance/features/apiSpaces/disableAndDeleteSpaces.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Disabling and deleting space
   As a manager of space
   I want to be able to disable the space first, then delete it.
diff --git a/tests/acceptance/features/apiSpaces/download.feature b/tests/acceptance/features/apiSpaces/download.feature
index 76163acb25e..56b3675ab58 100644
--- a/tests/acceptance/features/apiSpaces/download.feature
+++ b/tests/acceptance/features/apiSpaces/download.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Download file in project space
   As a user with different role
   I want to be able to download files
diff --git a/tests/acceptance/features/apiSpaces/editPublicLinkOfSpace.feature b/tests/acceptance/features/apiSpaces/editPublicLinkOfSpace.feature
index 6658b353749..d46316b5e65 100644
--- a/tests/acceptance/features/apiSpaces/editPublicLinkOfSpace.feature
+++ b/tests/acceptance/features/apiSpaces/editPublicLinkOfSpace.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: A manager of the space can edit public link
   As an user with manager space role
   I want to be able to edit a public link.
diff --git a/tests/acceptance/features/apiSpaces/filePreviews.feature b/tests/acceptance/features/apiSpaces/filePreviews.feature
index d46dfe93839..82f58fa49b5 100644
--- a/tests/acceptance/features/apiSpaces/filePreviews.feature
+++ b/tests/acceptance/features/apiSpaces/filePreviews.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Preview file in project space
   As a user
   I want to be able to download different files for the preview
diff --git a/tests/acceptance/features/apiSpaces/listSpaces.feature b/tests/acceptance/features/apiSpaces/listSpaces.feature
index 0dc114d5de1..2da5827ba25 100644
--- a/tests/acceptance/features/apiSpaces/listSpaces.feature
+++ b/tests/acceptance/features/apiSpaces/listSpaces.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: List and create spaces
   As a user
   I want to be able to list project spaces
diff --git a/tests/acceptance/features/apiSpaces/notification.feature b/tests/acceptance/features/apiSpaces/notification.feature
index 25c295668a5..b29d3846e2f 100644
--- a/tests/acceptance/features/apiSpaces/notification.feature
+++ b/tests/acceptance/features/apiSpaces/notification.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Notification
   As a user
   I want to be notified of actions related to me
diff --git a/tests/acceptance/features/apiSpaces/publicLink.feature b/tests/acceptance/features/apiSpaces/publicLink.feature
index ff7bb6aa40e..2d50dcafb3a 100644
--- a/tests/acceptance/features/apiSpaces/publicLink.feature
+++ b/tests/acceptance/features/apiSpaces/publicLink.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: public link for a space
 
   Background:
diff --git a/tests/acceptance/features/apiSpaces/quota.feature b/tests/acceptance/features/apiSpaces/quota.feature
index 3e9f385c331..6411aae880d 100644
--- a/tests/acceptance/features/apiSpaces/quota.feature
+++ b/tests/acceptance/features/apiSpaces/quota.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: State of the quota
   As a user
   I want to be able to see the state of the quota
diff --git a/tests/acceptance/features/apiSpaces/removeSpaceObjects.feature b/tests/acceptance/features/apiSpaces/removeSpaceObjects.feature
index f5fbc4faf52..a2d5767c14f 100644
--- a/tests/acceptance/features/apiSpaces/removeSpaceObjects.feature
+++ b/tests/acceptance/features/apiSpaces/removeSpaceObjects.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Remove files, folder
   As a user
   I want to be able to remove files, folders
diff --git a/tests/acceptance/features/apiSpaces/resharing.feature b/tests/acceptance/features/apiSpaces/resharing.feature
index f0407355160..4759e35c544 100644
--- a/tests/acceptance/features/apiSpaces/resharing.feature
+++ b/tests/acceptance/features/apiSpaces/resharing.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Resharing
   As a user
   I want to reshare resources
diff --git a/tests/acceptance/features/apiSpaces/restoreSpaceObjects.feature b/tests/acceptance/features/apiSpaces/restoreSpaceObjects.feature
index 85e2dbf851a..48636d3342d 100644
--- a/tests/acceptance/features/apiSpaces/restoreSpaceObjects.feature
+++ b/tests/acceptance/features/apiSpaces/restoreSpaceObjects.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Restore files, folder
   As a user with manager and editor role
   I want to be able to restore files, folders
diff --git a/tests/acceptance/features/apiSpaces/restoreSpaces.feature b/tests/acceptance/features/apiSpaces/restoreSpaces.feature
index 1dd7583eefc..58dbe75927a 100644
--- a/tests/acceptance/features/apiSpaces/restoreSpaces.feature
+++ b/tests/acceptance/features/apiSpaces/restoreSpaces.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Restoring space
   As a manager of space
   I want to be able to restore a disabled space
diff --git a/tests/acceptance/features/apiSpaces/search.feature b/tests/acceptance/features/apiSpaces/search.feature
index 86505f557e5..d57ba81951e 100644
--- a/tests/acceptance/features/apiSpaces/search.feature
+++ b/tests/acceptance/features/apiSpaces/search.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Search
   As a user 
   I want to search for resources in the space
diff --git a/tests/acceptance/features/apiSpaces/spaceManagement.feature b/tests/acceptance/features/apiSpaces/spaceManagement.feature
index 5c37ef60ea8..b66945568a5 100644
--- a/tests/acceptance/features/apiSpaces/spaceManagement.feature
+++ b/tests/acceptance/features/apiSpaces/spaceManagement.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Space management
   As a user with space admin permission
   I want to be able to manage all existing project spaces
diff --git a/tests/acceptance/features/apiSpaces/tag.feature b/tests/acceptance/features/apiSpaces/tag.feature
index 1bef37dd38c..4441314cc12 100644
--- a/tests/acceptance/features/apiSpaces/tag.feature
+++ b/tests/acceptance/features/apiSpaces/tag.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10 @skipOnStable2.0
+@api @skipOnStable2.0
 Feature: Tag
   As a user 
   I want to tag resources 
diff --git a/tests/acceptance/features/apiSpaces/tusUpload.feature b/tests/acceptance/features/apiSpaces/tusUpload.feature
index dd7bb84e0f5..37546e7c7b3 100644
--- a/tests/acceptance/features/apiSpaces/tusUpload.feature
+++ b/tests/acceptance/features/apiSpaces/tusUpload.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: upload resources using TUS protocol
   As a user
   I want to be able to upload files
diff --git a/tests/acceptance/features/apiSpaces/uploadSpaces.feature b/tests/acceptance/features/apiSpaces/uploadSpaces.feature
index efe8db2ccff..15bef1e1f61 100644
--- a/tests/acceptance/features/apiSpaces/uploadSpaces.feature
+++ b/tests/acceptance/features/apiSpaces/uploadSpaces.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Upload files into a space
   As a user
   I want to be able to create folders and files in the space
diff --git a/tests/acceptance/features/apiSpacesShares/changingFilesShare.feature b/tests/acceptance/features/apiSpacesShares/changingFilesShare.feature
index b1946f67538..d7f52757fce 100644
--- a/tests/acceptance/features/apiSpacesShares/changingFilesShare.feature
+++ b/tests/acceptance/features/apiSpacesShares/changingFilesShare.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: change shared resource
   As a user 
   I want to change the shared resource
diff --git a/tests/acceptance/features/apiSpacesShares/checksum.feature b/tests/acceptance/features/apiSpacesShares/checksum.feature
index cb5f3a7addf..fe0a78ff8da 100644
--- a/tests/acceptance/features/apiSpacesShares/checksum.feature
+++ b/tests/acceptance/features/apiSpacesShares/checksum.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: checksums
   As a user
   I want to upload files with checksum
@@ -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/apiSpacesShares/copySpaces.feature b/tests/acceptance/features/apiSpacesShares/copySpaces.feature
index 8f7103d27aa..bf100aa5839 100644
--- a/tests/acceptance/features/apiSpacesShares/copySpaces.feature
+++ b/tests/acceptance/features/apiSpacesShares/copySpaces.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: copy file
   As a user
   I want to be able to copy files
diff --git a/tests/acceptance/features/apiSpacesShares/createFileFolderWhenSharesSpaceExist.feature b/tests/acceptance/features/apiSpacesShares/createFileFolderWhenSharesSpaceExist.feature
index 7c7c0d5d08c..91e86f35244 100644
--- a/tests/acceptance/features/apiSpacesShares/createFileFolderWhenSharesSpaceExist.feature
+++ b/tests/acceptance/features/apiSpacesShares/createFileFolderWhenSharesSpaceExist.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: create file or folder named similar to Shares folder
   As a user
   I want to be able to create files and folders when the Shares folder exists
diff --git a/tests/acceptance/features/apiSpacesShares/favorite.feature b/tests/acceptance/features/apiSpacesShares/favorite.feature
index 88883438f95..7dbde9b9560 100644
--- a/tests/acceptance/features/apiSpacesShares/favorite.feature
+++ b/tests/acceptance/features/apiSpacesShares/favorite.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: favorite
   As a user
   I want to favorite resources
diff --git a/tests/acceptance/features/apiSpacesShares/moveSpaces.feature b/tests/acceptance/features/apiSpacesShares/moveSpaces.feature
index def01d03995..cc899e56a79 100644
--- a/tests/acceptance/features/apiSpacesShares/moveSpaces.feature
+++ b/tests/acceptance/features/apiSpacesShares/moveSpaces.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: move (rename) file
   As a user
   I want to be able to move and rename files
diff --git a/tests/acceptance/features/apiSpacesShares/publicLinkDownload.feature b/tests/acceptance/features/apiSpacesShares/publicLinkDownload.feature
index 588550aadc4..e33cd42431a 100644
--- a/tests/acceptance/features/apiSpacesShares/publicLinkDownload.feature
+++ b/tests/acceptance/features/apiSpacesShares/publicLinkDownload.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Public can download folders from project space public link
   As a public
   I want to be able to download folder from public link
diff --git a/tests/acceptance/features/apiSpacesShares/shareOperations.feature b/tests/acceptance/features/apiSpacesShares/shareOperations.feature
index 5aeae6aa976..9c9c5bec6b1 100644
--- a/tests/acceptance/features/apiSpacesShares/shareOperations.feature
+++ b/tests/acceptance/features/apiSpacesShares/shareOperations.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: sharing
   As a user
   I want to share resources with different permissions
diff --git a/tests/acceptance/features/apiSpacesShares/shareSpaces.feature b/tests/acceptance/features/apiSpacesShares/shareSpaces.feature
index 8fe0540a8f1..104a850da3f 100644
--- a/tests/acceptance/features/apiSpacesShares/shareSpaces.feature
+++ b/tests/acceptance/features/apiSpacesShares/shareSpaces.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Share spaces
   As the owner of a space
   I want to be able to add members to a space, and to remove access for them
diff --git a/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature b/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature
index d5feaf9adda..b22bbbc7702 100644
--- a/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature
+++ b/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Share spaces via link
   As the manager of a space
   I want to be able to share a space via public link
diff --git a/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpace.feature b/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpace.feature
index e4489bc63c1..a27eb44d9ac 100644
--- a/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpace.feature
+++ b/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpace.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Share a file or folder that is inside a space
   As a user with manager space role
   I want to be able to share the data inside the space
diff --git a/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature b/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature
index 98f869daadd..c4004ac47b3 100644
--- a/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature
+++ b/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: Share a file or folder that is inside a space via public link
   As a user with manager space role
   I want to be able to share the data inside the space via public link
diff --git a/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature b/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature
index 1f7b1e4b096..20b50416ab4 100644
--- a/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature
+++ b/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: upload resources on share using TUS protocol
   As a user
   I want to be able to upload files
diff --git a/tests/acceptance/features/bootstrap/FeatureContext.php b/tests/acceptance/features/bootstrap/FeatureContext.php
index 82e6973cf05..254c89a606a 100644
--- a/tests/acceptance/features/bootstrap/FeatureContext.php
+++ b/tests/acceptance/features/bootstrap/FeatureContext.php
@@ -1867,40 +1867,6 @@ public function createFileOnServerWithContent(
 		);
 	}
 
-	/**
-	 * @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 @@ public function theAdministratorRequestsStatusPhp(): void {
 		$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 @@ public function copyContentToFileInTemporaryStorageOnSystemUnderTest(
 		);
 	}
 
-	/**
-	 * @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 @@ public function moveFileInServerRoot(string $path, string $target): void {
 		$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
 	 *
@@ -3668,20 +3520,6 @@ public function setCapabilities(array $capabilitiesArray): void {
 		);
 	}
 
-	/**
-	 * After Scenario. restore trusted servers
-	 *
-	 * @AfterScenario @federation-app-required
-	 *
-	 * @return void
-	 */
-	public function restoreTrustedServersAfterScenario(): void {
-		$this->restoreTrustedServers('LOCAL');
-		if ($this->federatedServerExists()) {
-			$this->restoreTrustedServers('REMOTE');
-		}
-	}
-
 	/**
 	 * @param string $sourceUser
 	 * @param string $targetUser
@@ -3817,21 +3655,6 @@ public function getBodyForOCSRequest(string $method, string $property): ?string
 		return $body;
 	}
 
-	/**
-	 * Before Scenario to Save trusted Servers
-	 *
-	 * @BeforeScenario @federation-app-required
-	 *
-	 * @return void
-	 * @throws Exception
-	 */
-	public function setInitialTrustedServersBeforeScenario(): void {
-		$this->initialTrustedServer = [
-			'LOCAL' => $this->getTrustedServers(),
-			'REMOTE' => $this->getTrustedServers('REMOTE')
-		];
-	}
-
 	/**
 	 * The method returns userId
 	 *
diff --git a/tests/acceptance/features/bootstrap/bootstrap.php b/tests/acceptance/features/bootstrap/bootstrap.php
index fc5815031be..7eac6e5e670 100644
--- a/tests/acceptance/features/bootstrap/bootstrap.php
+++ b/tests/acceptance/features/bootstrap/bootstrap.php
@@ -91,9 +91,3 @@
 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/coreApiAuth/webDavAuth.feature b/tests/acceptance/features/coreApiAuth/webDavAuth.feature
index 6cad62973aa..c4bd522a3a2 100644
--- a/tests/acceptance/features/coreApiAuth/webDavAuth.feature
+++ b/tests/acceptance/features/coreApiAuth/webDavAuth.feature
@@ -12,7 +12,7 @@ Feature: auth
     When a user requests "/remote.php/webdav" with "PROPFIND" and no authentication
     Then the HTTP status code should be "401"
 
-  @smokeTest @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: using spaces WebDAV anonymously
     When user "Alice" requests "/dav/spaces/%spaceid%" with "PROPFIND" and no authentication
     Then the HTTP status code should be "401"
@@ -25,7 +25,7 @@ Feature: auth
       | dav_path           |
       | /remote.php/webdav |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_path              |
       | /dav/spaces/%spaceid% |
diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsDELETEAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsDELETEAuth.feature
index b0964f3af8e..6dee5a4c2b1 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
@@ -7,7 +7,7 @@ Feature: auth
   Background:
     Given user "another-admin" has been created with default attributes and without skeleton files
 
-  @smokeTest @issue-1337 @issue-1319 @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest @issue-1337 @issue-1319
   Scenario: send DELETE requests to OCS endpoints as admin with wrong password
     Given user "another-admin" has been added to group "admin"
     When user "another-admin" requests these endpoints with "DELETE" using password "invalid" about user "Alice"
diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsGETAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsGETAuth.feature
index 5f8a6cf1282..3d9d08444c7 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
@@ -72,7 +72,7 @@ Feature: auth
     Then the HTTP status code of responses on all endpoints should be "401"
     And the OCS status code of responses on all endpoints should be "401"
 
-  @issue-1338 @issue-1337 @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @issue-1338 @issue-1337 @smokeTest
   Scenario: using OCS as normal user with wrong password
     When user "Alice" requests these endpoints with "GET" using password "invalid"
       | endpoint                                                    |
@@ -120,7 +120,7 @@ Feature: auth
     Then the HTTP status code of responses on all endpoints should be "200"
     And the OCS status code of responses on all endpoints should be "200"
 
-  @issue-1337 @issue-1319 @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @issue-1337 @issue-1319
   Scenario: using OCS as admin user with wrong password
     Given user "another-admin" has been created with default attributes and without skeleton files
     And user "another-admin" has been added to group "admin"
diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsPOSTAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsPOSTAuth.feature
index 58acdab38d5..d18ea766f89 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
@@ -7,7 +7,7 @@ Feature: auth
   Background:
     Given user "Alice" has been created with default attributes and without skeleton files
 
-  @issue-1337 @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @issue-1337 @smokeTest
   Scenario: send POST requests to OCS endpoints as normal user with wrong password
     When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                                        |
diff --git a/tests/acceptance/features/coreApiAuthOcs/ocsPUTAuth.feature b/tests/acceptance/features/coreApiAuthOcs/ocsPUTAuth.feature
index d0de79637e7..4ca72511f31 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
@@ -7,7 +7,7 @@ Feature: auth
   Background:
     Given user "another-admin" has been created with default attributes and without skeleton files
 
-  @issue-1337 @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @issue-1337 @smokeTest
   Scenario: send PUT request to OCS endpoints as admin with wrong password
     Given user "another-admin" has been added to group "admin"
     When user "another-admin" requests these endpoints with "PUT" including body "doesnotmatter" using password "invalid" about user "Alice"
diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavCOPYAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavCOPYAuth.feature
index 009fe4837b5..15910766d32 100644
--- a/tests/acceptance/features/coreApiAuthWebDav/webDavCOPYAuth.feature
+++ b/tests/acceptance/features/coreApiAuthWebDav/webDavCOPYAuth.feature
@@ -14,7 +14,7 @@ Feature: COPY file/folder
     And user "Alice" has created folder "/FOLDER"
     And user "Alice" has uploaded file with content "some data" to "/PARENT/parent.txt"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send COPY requests to webDav endpoints as normal user with wrong password
     When user "Alice" requests these endpoints with "COPY" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -25,7 +25,7 @@ Feature: COPY file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send COPY requests to webDav endpoints as normal user with wrong password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "COPY" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -34,7 +34,7 @@ Feature: COPY file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send COPY requests to webDav endpoints as normal user with no password
     When user "Alice" requests these endpoints with "COPY" using password "" about user "Alice"
       | endpoint                                           |
@@ -45,7 +45,7 @@ Feature: COPY file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send COPY requests to webDav endpoints as normal user with no password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "COPY" using password "" about user "Alice"
       | endpoint                                           |
@@ -63,7 +63,7 @@ Feature: COPY file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "403"
 
- @skipOnOcV10 @personalSpace
+ @personalSpace
  Scenario: send COPY requests to another user's webDav endpoints as normal user using the spaces WebDAV API
    When user "Brian" requests these endpoints with "COPY" about user "Alice"
      | endpoint                                           |
@@ -83,7 +83,7 @@ Feature: COPY file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send COPY requests to webDav endpoints using invalid username but correct password using the spaces WebDAV API
     When user "usero" requests these endpoints with "COPY" using the password of user "Alice"
       | endpoint                                           |
@@ -103,7 +103,7 @@ Feature: COPY file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send COPY requests to webDav endpoints using valid password and username of different user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "COPY" using the password of user "Alice"
       | endpoint                                           |
@@ -112,7 +112,7 @@ Feature: COPY file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send COPY requests to webDav endpoints without any authentication
     When a user requests these endpoints with "COPY" with no authentication about user "Alice"
       | endpoint                                           |
@@ -123,7 +123,7 @@ Feature: COPY file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send COPY requests to webDav endpoints without any authentication using the spaces WebDAV API
     When a user requests these endpoints with "COPY" with no authentication about user "Alice"
       | endpoint                                           |
@@ -132,7 +132,7 @@ Feature: COPY file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10
+  
   Scenario: send COPY requests to webDav endpoints with body as normal user
     When user "Alice" requests these endpoints with "COPY" including body "doesnotmatter" about user "Alice"
       | endpoint                                           |
@@ -144,7 +144,7 @@ Feature: COPY file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "415"
 
- @skipOnOcV10 @personalSpace
+ @personalSpace
   Scenario: send COPY requests to webDav endpoints with body as normal user using the spaces WebDAV API
     When user "Alice" requests these endpoints with "COPY" including body "doesnotmatter" about user "Alice"
       | endpoint                                           |
diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavDELETEAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavDELETEAuth.feature
index dd395a71996..f1a9ded1063 100644
--- a/tests/acceptance/features/coreApiAuthWebDav/webDavDELETEAuth.feature
+++ b/tests/acceptance/features/coreApiAuthWebDav/webDavDELETEAuth.feature
@@ -15,7 +15,7 @@ Feature: delete file/folder
     And user "Alice" has created folder "/FOLDER"
     And user "Alice" has uploaded file with content "some data" to "/PARENT/parent.txt"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send DELETE requests to webDav endpoints as normal user with wrong password
     When user "Alice" requests these endpoints with "DELETE" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -27,7 +27,7 @@ Feature: delete file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send DELETE requests to webDav endpoints as normal user with wrong password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "DELETE" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -48,7 +48,7 @@ Feature: delete file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send DELETE requests to webDav endpoints as normal user with no password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "DELETE" using password "" about user "Alice"
       | endpoint                                           |
@@ -66,7 +66,7 @@ Feature: delete file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "404"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send DELETE requests to another user's webDav endpoints as normal user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "DELETE" about user "Alice"
       | endpoint                                           |
@@ -86,7 +86,7 @@ Feature: delete file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send DELETE requests to webDav endpoints using invalid username but correct password using the spaces WebDAV API
     When user "usero" requests these endpoints with "DELETE" using the password of user "Alice"
       | endpoint                                           |
@@ -106,7 +106,7 @@ Feature: delete file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send DELETE requests to webDav endpoints using valid password and username of different user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "DELETE" using the password of user "Alice"
       | endpoint                                           |
@@ -115,7 +115,7 @@ Feature: delete file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send DELETE requests to webDav endpoints without any authentication
     When a user requests these endpoints with "DELETE" with no authentication about user "Alice"
       | endpoint                                           |
@@ -126,7 +126,7 @@ Feature: delete file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send DELETE requests to webDav endpoints without any authentication using the spaces WebDAV API
     When a user requests these endpoints with "DELETE" with no authentication about user "Alice"
       | endpoint                                           |
@@ -135,7 +135,7 @@ Feature: delete file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10
+  
   Scenario: send DELETE requests to webDav endpoints with body as normal user
     When user "Alice" requests these endpoints with "DELETE" including body "doesnotmatter" about user "Alice"
       | endpoint                                           |
@@ -146,7 +146,7 @@ Feature: delete file/folder
       | /remote.php/dav/files/%username%/FOLDER            |
     Then the HTTP status code of responses on all endpoints should be "415"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send DELETE requests to webDav endpoints with body as normal user using the spaces WebDAV API
     When user "Alice" requests these endpoints with "DELETE" including body "doesnotmatter" about user "Alice"
       | endpoint                                           |
diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavLOCKAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavLOCKAuth.feature
index 5e760fcdcd2..08f7cf40dff 100644
--- a/tests/acceptance/features/coreApiAuthWebDav/webDavLOCKAuth.feature
+++ b/tests/acceptance/features/coreApiAuthWebDav/webDavLOCKAuth.feature
@@ -15,7 +15,7 @@ Feature: LOCK file/folder
     And user "Alice" has created folder "/FOLDER"
     And user "Alice" has uploaded file with content "some data" to "/PARENT/parent.txt"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send LOCK requests to webDav endpoints as normal user with wrong password
     When user "Alice" requests these endpoints with "LOCK" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -26,7 +26,7 @@ Feature: LOCK file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send LOCK requests to webDav endpoints as normal user with wrong password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "LOCK" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -35,7 +35,7 @@ Feature: LOCK file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send LOCK requests to webDav endpoints as normal user with no password
     When user "Alice" requests these endpoints with "LOCK" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -46,7 +46,7 @@ Feature: LOCK file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send LOCK requests to webDav endpoints as normal user with no password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "LOCK" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -90,7 +90,7 @@ Feature: LOCK file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send LOCK requests to webDav endpoints using invalid username but correct password using the spaces WebDAV API
     When user "usero" requests these endpoints with "LOCK" including body "doesnotmatter" using the password of user "Alice"
       | endpoint                                           |
@@ -110,7 +110,7 @@ Feature: LOCK file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send LOCK requests to webDav endpoints using valid password and username of different user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "LOCK" including body "doesnotmatter" using the password of user "Alice"
       | endpoint                                           |
@@ -119,7 +119,7 @@ Feature: LOCK file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send LOCK requests to webDav endpoints without any authentication
     When a user requests these endpoints with "LOCK" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
@@ -130,7 +130,7 @@ Feature: LOCK file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send LOCK requests to webDav endpoints without any authentication using the spaces WebDAV API
     When a user requests these endpoints with "LOCK" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavMKCOLAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavMKCOLAuth.feature
index 0dfaf0c6823..6e74cbd94d7 100644
--- a/tests/acceptance/features/coreApiAuthWebDav/webDavMKCOLAuth.feature
+++ b/tests/acceptance/features/coreApiAuthWebDav/webDavMKCOLAuth.feature
@@ -11,7 +11,7 @@ Feature: create folder using MKCOL
     And user "Alice" has created folder "/FOLDER"
     And user "Alice" has uploaded file with content "some data" to "/PARENT/parent.txt"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send MKCOL requests to webDav endpoints as normal user with wrong password
     When user "Alice" requests these endpoints with "MKCOL" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -22,7 +22,7 @@ Feature: create folder using MKCOL
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send MKCOL requests to webDav endpoints as normal user with wrong password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "MKCOL" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -31,7 +31,7 @@ Feature: create folder using MKCOL
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send MKCOL requests to webDav endpoints as normal user with no password
     When user "Alice" requests these endpoints with "MKCOL" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -42,7 +42,7 @@ Feature: create folder using MKCOL
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnOcV10 @personalSpace @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest @personalSpace
   Scenario: send MKCOL requests to webDav endpoints as normal user with no password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "MKCOL" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -51,7 +51,7 @@ Feature: create folder using MKCOL
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @issue-5049 @issue-1347 @issue-1292
+  @issue-5049 @issue-1347 @issue-1292
   Scenario: send MKCOL requests to another user's webDav endpoints as normal user
     Given user "Brian" has been created with default attributes and without skeleton files
     When user "Brian" requests these endpoints with "MKCOL" including body "" about user "Alice"
@@ -62,7 +62,7 @@ Feature: create folder using MKCOL
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "404"
 
-  @skipOnOcV10 @issue-5049 @issue-1347 @issue-1292
+  @issue-5049 @issue-1347 @issue-1292
   Scenario: send MKCOL requests to non-existent user's webDav endpoints as normal user
     Given user "Brian" has been created with default attributes and without skeleton files
     When user "Brian" requests these endpoints with "MKCOL" including body "" about user "non-existent-user"
@@ -84,7 +84,7 @@ Feature: create folder using MKCOL
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "404"
 
-  @skipOnOcV10 @issue-5049 @personalSpace @issue-1347 @issue-1292
+  @issue-5049 @personalSpace @issue-1347 @issue-1292
   Scenario: send MKCOL requests to non-existent user's webDav endpoints as normal user using the spaces WebDAV API
     Given user "Brian" has been created with default attributes and without skeleton files
     When user "Brian" requests these endpoints with "MKCOL" including body "" about user "non-existent-user"
@@ -106,7 +106,7 @@ Feature: create folder using MKCOL
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send MKCOL requests to webDav endpoints using invalid username but correct password using the spaces WebDAV API
     When user "usero" requests these endpoints with "MKCOL" including body "doesnotmatter" using the password of user "Alice"
       | endpoint                                           |
@@ -127,7 +127,7 @@ Feature: create folder using MKCOL
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send MKCOL requests to webDav endpoints using valid password and username of different user using the spaces WebDAV API
     Given user "Brian" has been created with default attributes and without skeleton files
     When user "Brian" requests these endpoints with "MKCOL" including body "doesnotmatter" using the password of user "Alice"
@@ -137,7 +137,7 @@ Feature: create folder using MKCOL
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send MKCOL requests to webDav endpoints without any authentication
     When a user requests these endpoints with "MKCOL" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
@@ -148,7 +148,7 @@ Feature: create folder using MKCOL
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send MKCOL requests to webDav endpoints without any authentication using the spaces WebDAV API
     When a user requests these endpoints with "MKCOL" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavMOVEAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavMOVEAuth.feature
index 3df9bb8c322..78ed5eb6663 100644
--- a/tests/acceptance/features/coreApiAuthWebDav/webDavMOVEAuth.feature
+++ b/tests/acceptance/features/coreApiAuthWebDav/webDavMOVEAuth.feature
@@ -14,7 +14,7 @@ Feature: MOVE file/folder
     And user "Alice" has created folder "/FOLDER"
     And user "Alice" has uploaded file with content "some data" to "/PARENT/parent.txt"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send MOVE requests to webDav endpoints as normal user with wrong password
     When user "Alice" requests these endpoints with "MOVE" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -25,7 +25,7 @@ Feature: MOVE file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send MOVE requests to webDav endpoints as normal user with wrong password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "MOVE" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -34,7 +34,7 @@ Feature: MOVE file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send MOVE requests to webDav endpoints as normal user with no password
     When user "Alice" requests these endpoints with "MOVE" using password "" about user "Alice"
       | endpoint                                           |
@@ -45,7 +45,7 @@ Feature: MOVE file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send MOVE requests to webDav endpoints as normal user with no password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "MOVE" using password "" about user "Alice"
       | endpoint                                           |
@@ -63,7 +63,7 @@ Feature: MOVE file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "403"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send MOVE requests to another user's webDav endpoints as normal user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "MOVE" about user "Alice"
       | endpoint                                           |
@@ -83,7 +83,7 @@ Feature: MOVE file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send MOVE requests to webDav endpoints using invalid username but correct password using the spaces WebDAV API
     When user "usero" requests these endpoints with "MOVE" using the password of user "Alice"
       | endpoint                                           |
@@ -103,7 +103,7 @@ Feature: MOVE file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send MOVE requests to webDav endpoints using valid password and username of different user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "MOVE" using the password of user "Alice"
       | endpoint                                           |
@@ -112,7 +112,7 @@ Feature: MOVE file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send MOVE requests to webDav endpoints without any authentication
     When a user requests these endpoints with "MOVE" with no authentication about user "Alice"
       | endpoint                                           |
@@ -123,7 +123,7 @@ Feature: MOVE file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send MOVE requests to webDav endpoints without any authentication using the spaces WebDAV API
     When a user requests these endpoints with "MOVE" with no authentication about user "Alice"
       | endpoint                                           |
@@ -132,7 +132,7 @@ Feature: MOVE file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10
+  
   Scenario: send MOVE requests to webDav endpoints with body as normal user
     When user "Alice" requests these endpoints with "MOVE" including body "doesnotmatter" about user "Alice"
       | endpoint                                           |
@@ -144,7 +144,7 @@ Feature: MOVE file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "415"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send MOVE requests to webDav endpoints with body as normal user using the spaces WebDAV API
     When user "Alice" requests these endpoints with "MOVE" including body "doesnotmatter" about user "Alice"
       | endpoint                                           |
diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavPOSTAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavPOSTAuth.feature
index b98b06ab5d0..425d0359640 100644
--- a/tests/acceptance/features/coreApiAuthWebDav/webDavPOSTAuth.feature
+++ b/tests/acceptance/features/coreApiAuthWebDav/webDavPOSTAuth.feature
@@ -15,7 +15,7 @@ Feature: POST file/folder
     And user "Alice" has created folder "/FOLDER"
     And user "Alice" has uploaded file with content "some data" to "/PARENT/parent.txt"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send POST requests to webDav endpoints as normal user with wrong password
     When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -26,7 +26,7 @@ Feature: POST file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send POST requests to webDav endpoints as normal user with wrong password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -35,7 +35,7 @@ Feature: POST file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send POST requests to webDav endpoints as normal user with no password
     When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -46,7 +46,7 @@ Feature: POST file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send POST requests to webDav endpoints as normal user with no password  using the spaces WebDAV API
     When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -64,7 +64,7 @@ Feature: POST file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "404"
 
-  @skipOnOcV10 @personalSpace @issue-1287
+  @personalSpace @issue-1287
   Scenario: send POST requests to another user's webDav endpoints as normal user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "POST" including body "doesnotmatter" about user "Alice"
       | endpoint                                           |
@@ -84,7 +84,7 @@ Feature: POST file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send POST requests to webDav endpoints using invalid username but correct password using the spaces WebDAV API
     When user "usero" requests these endpoints with "POST" including body "doesnotmatter" using the password of user "Alice"
       | endpoint                                           |
@@ -104,7 +104,7 @@ Feature: POST file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send POST requests to webDav endpoints using valid password and username of different user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "POST" including body "doesnotmatter" using the password of user "Alice"
       | endpoint                                           |
@@ -113,7 +113,7 @@ Feature: POST file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send POST requests to webDav endpoints without any authentication
     When a user requests these endpoints with "POST" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
@@ -124,7 +124,7 @@ Feature: POST file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send POST requests to webDav endpoints without any authentication using the spaces WebDAV API
     When a user requests these endpoints with "POST" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavPROPFINDAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavPROPFINDAuth.feature
index 8ad9186c8be..307d310df1b 100644
--- a/tests/acceptance/features/coreApiAuthWebDav/webDavPROPFINDAuth.feature
+++ b/tests/acceptance/features/coreApiAuthWebDav/webDavPROPFINDAuth.feature
@@ -14,7 +14,7 @@ Feature: PROPFIND file/folder
     And user "Alice" has created folder "/FOLDER"
     And user "Alice" has uploaded file with content "some data" to "/PARENT/parent.txt"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send PROPFIND requests to webDav endpoints as normal user with wrong password
     When user "Alice" requests these endpoints with "PROPFIND" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -25,7 +25,7 @@ Feature: PROPFIND file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send PROPFIND requests to webDav endpoints as normal user with wrong password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "PROPFIND" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -34,7 +34,7 @@ Feature: PROPFIND file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send PROPFIND requests to webDav endpoints as normal user with no password
     When user "Alice" requests these endpoints with "PROPFIND" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -45,7 +45,7 @@ Feature: PROPFIND file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send PROPFIND requests to webDav endpoints as normal user with no password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "PROPFIND" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -63,7 +63,7 @@ Feature: PROPFIND file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "404"
 
-  @skipOnOcV10 @personalSpace @issue-1347
+  @personalSpace @issue-1347
   Scenario: send PROPFIND requests to another user's webDav endpoints as normal user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "PROPFIND" to get property "d:getetag" about user "Alice"
       | endpoint                                           |
@@ -83,7 +83,7 @@ Feature: PROPFIND file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send PROPFIND requests to webDav endpoints using invalid username but correct password using the spaces WebDAV API
     When user "usero" requests these endpoints with "PROPFIND" including body "doesnotmatter" using the password of user "Alice"
       | endpoint                                           |
@@ -103,7 +103,7 @@ Feature: PROPFIND file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send PROPFIND requests to webDav endpoints using valid password and username of different user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "PROPFIND" including body "doesnotmatter" using the password of user "Alice"
       | endpoint                                           |
@@ -112,7 +112,7 @@ Feature: PROPFIND file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send PROPFIND requests to webDav endpoints without any authentication
     When a user requests these endpoints with "PROPFIND" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
@@ -123,7 +123,7 @@ Feature: PROPFIND file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send PROPFIND requests to webDav endpoints without any authentication using the spaces WebDAV API
     When a user requests these endpoints with "PROPFIND" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavPROPPATCHAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavPROPPATCHAuth.feature
index fc6a9f31145..b7e59c7998c 100644
--- a/tests/acceptance/features/coreApiAuthWebDav/webDavPROPPATCHAuth.feature
+++ b/tests/acceptance/features/coreApiAuthWebDav/webDavPROPPATCHAuth.feature
@@ -15,7 +15,7 @@ Feature: PROPPATCH file/folder
     And user "Alice" has created folder "/FOLDER"
     And user "Alice" has uploaded file with content "some data" to "/PARENT/parent.txt"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send PROPPATCH requests to webDav endpoints as normal user with wrong password
     When user "Alice" requests these endpoints with "PROPPATCH" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -26,7 +26,7 @@ Feature: PROPPATCH file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send PROPPATCH requests to webDav endpoints as normal user with wrong password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "PROPPATCH" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -35,7 +35,7 @@ Feature: PROPPATCH file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send PROPPATCH requests to webDav endpoints as normal user with no password
     When user "Alice" requests these endpoints with "PROPPATCH" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -46,7 +46,7 @@ Feature: PROPPATCH file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send PROPPATCH requests to webDav endpoints as normal user with no password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "PROPPATCH" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -64,7 +64,7 @@ Feature: PROPPATCH file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "404"
 
-  @issue-1347 @issue-1292 @skipOnOcV10 @personalSpace
+  @issue-1347 @issue-1292 @personalSpace
   Scenario: send PROPPATCH requests to another user's webDav endpoints as normal user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "PROPPATCH" to set property "favorite" about user "Alice"
       | endpoint                                           |
@@ -84,7 +84,7 @@ Feature: PROPPATCH file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send PROPPATCH requests to webDav endpoints using invalid username but correct password using the spaces WebDAV API
     When user "usero" requests these endpoints with "PROPPATCH" including body "doesnotmatter" using the password of user "Alice"
       | endpoint                                           |
@@ -104,7 +104,7 @@ Feature: PROPPATCH file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send PROPPATCH requests to webDav endpoints using valid password and username of different user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "PROPPATCH" including body "doesnotmatter" using the password of user "Alice"
       | endpoint                                           |
@@ -113,7 +113,7 @@ Feature: PROPPATCH file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send PROPPATCH requests to webDav endpoints without any authentication
     When a user requests these endpoints with "PROPPATCH" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
@@ -124,7 +124,7 @@ Feature: PROPPATCH file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send PROPPATCH requests to webDav endpoints without any authentication using the spaces WebDAV API
     When a user requests these endpoints with "PROPPATCH" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavPUTAuth.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavPUTAuth.feature
index 968dce3d2d1..c45adc3005f 100644
--- a/tests/acceptance/features/coreApiAuthWebDav/webDavPUTAuth.feature
+++ b/tests/acceptance/features/coreApiAuthWebDav/webDavPUTAuth.feature
@@ -15,7 +15,7 @@ Feature: PUT file/folder
     And user "Alice" has created folder "/FOLDER"
     And user "Alice" has uploaded file with content "some data" to "/PARENT/parent.txt"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send PUT requests to webDav endpoints as normal user with wrong password
     When user "Alice" requests these endpoints with "PUT" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -26,7 +26,7 @@ Feature: PUT file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send PUT requests to webDav endpoints as normal user with wrong password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "PUT" including body "doesnotmatter" using password "invalid" about user "Alice"
       | endpoint                                           |
@@ -35,7 +35,7 @@ Feature: PUT file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send PUT requests to webDav endpoints as normal user with no password
     When user "Alice" requests these endpoints with "PUT" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -46,7 +46,7 @@ Feature: PUT file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send PUT requests to webDav endpoints as normal user with no password using the spaces WebDAV API
     When user "Alice" requests these endpoints with "PUT" including body "doesnotmatter" using password "" about user "Alice"
       | endpoint                                           |
@@ -55,7 +55,7 @@ Feature: PUT file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10
+  
   Scenario: send PUT requests to another user's webDav endpoints as normal user
     When user "Brian" requests these endpoints with "PUT" including body "doesnotmatter" about user "Alice"
       | endpoint                                       |
@@ -67,7 +67,7 @@ Feature: PUT file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "403"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send PUT requests to another user's webDav endpoints as normal user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "PUT" including body "doesnotmatter" about user "Alice"
       | endpoint                                       |
@@ -90,7 +90,7 @@ Feature: PUT file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send PUT requests to webDav endpoints using invalid username but correct password using the spaces WebDAV API
     When user "usero" requests these endpoints with "PUT" including body "doesnotmatter" using the password of user "Alice"
       | endpoint                                           |
@@ -110,7 +110,7 @@ Feature: PUT file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send PUT requests to webDav endpoints using valid password and username of different user using the spaces WebDAV API
     When user "Brian" requests these endpoints with "PUT" including body "doesnotmatter" using the password of user "Alice"
       | endpoint                                           |
@@ -119,7 +119,7 @@ Feature: PUT file/folder
       | /remote.php/dav/spaces/%spaceid%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112
+  @smokeTest
   Scenario: send PUT requests to webDav endpoints without any authentication
     When a user requests these endpoints with "PUT" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
@@ -130,7 +130,7 @@ Feature: PUT file/folder
       | /remote.php/dav/files/%username%/PARENT/parent.txt |
     Then the HTTP status code of responses on all endpoints should be "401"
 
-  @smokeTest @skipOnBruteForceProtection @issue-brute_force_protection-112 @skipOnOcV10 @personalSpace
+  @smokeTest @personalSpace
   Scenario: send PUT requests to webDav endpoints without any authentication using the spaces WebDAV API
     When a user requests these endpoints with "PUT" with body "doesnotmatter" and no authentication about user "Alice"
       | endpoint                                           |
diff --git a/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature b/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature
index 3338ad235d3..156cb0d58be 100644
--- a/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature
+++ b/tests/acceptance/features/coreApiAuthWebDav/webDavSpecialURLs.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10.10.0
+@api
 Feature: make webdav request with special urls
   As a user
   I want to make webdav request with special urls
@@ -23,7 +23,7 @@ Feature: make webdav request with special urls
       | //remote.php/dav//files/%username%//FOLDER          |
     Then the HTTP status code of responses on all endpoints should be "204"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send DELETE requests to webDav endpoints with 2 slashes using the spaces WebDAV API
     When user "Alice" requests these endpoints with "DELETE" using password "%regular%" about user "Alice"
       | endpoint                                             |
@@ -44,7 +44,7 @@ Feature: make webdav request with special urls
       | //remote.php/dav//files/%username%//FOLDER          |
     Then the HTTP status code of responses on all endpoints should be "200"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send GET requests to webDav endpoints with 2 slashes using the spaces WebDAV API
     When user "Alice" requests these endpoints with "GET" using password "%regular%" about user "Alice"
       | endpoint                                             |
@@ -65,7 +65,7 @@ Feature: make webdav request with special urls
       | //remote.php/dav//files/%username%//FOLDER          |
     Then the HTTP status code of responses on all endpoints should be "200"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send LOCK requests to webDav endpoints with 2 slashes using the spaces WebDAV API
     When the user "Alice" requests these endpoints with "LOCK" to get property "d:shared" with password "%regular%" about user "Alice"
       | endpoint                                             |
@@ -87,7 +87,7 @@ Feature: make webdav request with special urls
       | /remote.php/dav//files/%username%/PARENT6  |
     Then the HTTP status code of responses on all endpoints should be "201"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send MKCOL requests to webDav endpoints with 2 slashes using the spaces WebDAV API
     When user "Alice" requests these endpoints with "MKCOL" using password "%regular%" about user "Alice"
       | endpoint                                   |
@@ -110,7 +110,7 @@ Feature: make webdav request with special urls
       | /remote.php/dav//files/%username%/PARENT2/parent.txt | /remote.php/dav/files/%username%/PARENT2/parent1.txt |
     Then the HTTP status code of responses on all endpoints should be "201"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send MOVE requests to webDav endpoints with 2 slashes using the spaces WebDAV API
     When user "Alice" requests these endpoints with "MOVE" using password "%regular%" about user "Alice"
       | endpoint                                             | destination                                          |
@@ -131,7 +131,7 @@ Feature: make webdav request with special urls
       | //remote.php/dav//files/%username%//FOLDER          |
     Then the HTTP status code of responses on all endpoints should be "500" or "501"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send POST requests to webDav endpoints with 2 slashes using the spaces WebDAV API
     When user "Alice" requests these endpoints with "POST" including body "doesnotmatter" using password "%regular%" about user "Alice"
       | endpoint                                            |
@@ -152,7 +152,7 @@ Feature: make webdav request with special urls
       | //remote.php/dav//files/%username%//FOLDER           |
     Then the HTTP status code of responses on all endpoints should be "207"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send PROPFIND requests to webDav endpoints with 2 slashes using the spaces WebDAV API
     When the user "Alice" requests these endpoints with "PROPFIND" to get property "d:href" with password "%regular%" about user "Alice"
       | endpoint                                            |
@@ -173,7 +173,7 @@ Feature: make webdav request with special urls
       | //remote.php/dav//files/%username%//FOLDER           |
     Then the HTTP status code of responses on all endpoints should be "207"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send PROPPATCH requests to webDav endpoints with 2 slashes using the spaces WebDAV API
     When the user "Alice" requests these endpoints with "PROPPATCH" to set property "d:getlastmodified" with password "%regular%" about user "Alice"
       | endpoint                                            |
@@ -194,7 +194,7 @@ Feature: make webdav request with special urls
       | //remote.php/dav/files/%username%/PARENT//parent.txt |
     Then the HTTP status code of responses on all endpoints should be "204" or "201"
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
   Scenario: send PUT requests to webDav endpoints with 2 slashes using the spaces WebDAV API
     When user "Alice" requests these endpoints with "PUT" including body "doesnotmatter" using password "%regular%" about user "Alice"
       | endpoint                                             |
diff --git a/tests/acceptance/features/coreApiCapabilities/capabilities.feature b/tests/acceptance/features/coreApiCapabilities/capabilities.feature
index 1c895f22ea5..e34ae3e5e36 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
@@ -54,7 +54,7 @@ Feature: capabilities
     }
     """
 
-  @files_trashbin-app-required @skipOnReva
+  @skipOnReva
   Scenario: getting trashbin app capability with admin user
     When the administrator retrieves the capabilities using the capabilities API
     Then the OCS status code should be "100"
@@ -93,7 +93,7 @@ Feature: capabilities
     }
     """
 
-  @files_versions-app-required @skipOnReva
+ @skipOnReva
   Scenario: getting versions app capability with admin user
     When the administrator retrieves the capabilities using the capabilities API
     Then the OCS status code should be "100"
diff --git a/tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature b/tests/acceptance/features/coreApiCapabilities/capabilitiesWithNormalUser.feature
index 7d76993b3c3..151bb760121 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/favorites.feature b/tests/acceptance/features/coreApiFavorites/favorites.feature
index d3cc913da3e..4ad155cae58 100644
--- a/tests/acceptance/features/coreApiFavorites/favorites.feature
+++ b/tests/acceptance/features/coreApiFavorites/favorites.feature
@@ -32,7 +32,7 @@ Feature: favorite
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -54,7 +54,7 @@ Feature: favorite
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -75,7 +75,7 @@ Feature: favorite
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -97,7 +97,7 @@ Feature: favorite
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -118,7 +118,7 @@ Feature: favorite
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -145,7 +145,7 @@ Feature: favorite
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -222,7 +222,7 @@ Feature: favorite
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature b/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature
index 67504e83e19..7defe289551 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 a0324d5a755..1bbd38966ca 100644
--- a/tests/acceptance/features/coreApiMain/checksums.feature
+++ b/tests/acceptance/features/coreApiMain/checksums.feature
@@ -16,7 +16,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -32,7 +32,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -49,7 +49,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -66,7 +66,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -84,7 +84,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -102,7 +102,7 @@ Feature: checksums
       | dav_version |
       | old         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -120,7 +120,7 @@ Feature: checksums
       | dav_version |
       | old         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -138,7 +138,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -154,7 +154,7 @@ Feature: checksums
       | dav_version |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -170,12 +170,12 @@ Feature: checksums
       | dav_version |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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 @skipOnOcV10
+  @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
@@ -217,7 +217,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -232,7 +232,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -251,7 +251,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -268,7 +268,7 @@ Feature: checksums
       | dav_version |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -292,7 +292,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -315,7 +315,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -333,7 +333,7 @@ Feature: checksums
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -356,7 +356,7 @@ Feature: checksums
       | new         | " oc?test=ab&cd " |
       | new         | "# %ab ab?=ed"    |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | renamed_file      |
       | spaces      | " oc?test=ab&cd " |
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature
index ac6e6beccda..e9b8939bfad 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 85a8f9004be..883a31e80a8 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 3d2b7d2f47d..77559e7c1a5 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 61c348884c2..816e884affd 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 6f097e82aae..da748c232dd 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 6b63881b6a7..3d4be97ec94 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 dc77eb22faf..c4629b459bf 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 6ae1f67455c..654fb3daab0 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
@@ -525,7 +525,7 @@ Feature: sharing
     And file "/textfile0.txt" should not be included as path in the response
     And as "Brian" file "/Shares/textfile0.txt" should not exist
     And as "Carol" file "/Shares/textfile0.txt" should not exist
-    @skipOnOcV10 @issue-2441
+    @issue-2441
     Examples:
       | ocs_api_version | ocs_status_code | path           |
       | 1               | 100             | /textfile0.txt |
diff --git a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature
index 134ef48a6b2..597ac6c06c4 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
@@ -61,7 +61,7 @@ Feature: sharing
       | pending_share_path |
       | /sub               |
 
-  @smokeTest @files_trashbin-app-required
+  @smokeTest
   Scenario: deleting a file out of a share as recipient creates a backup for the owner
     Given using OCS API version "1"
     And user "Alice" has created folder "/shared"
@@ -75,7 +75,7 @@ Feature: sharing
     And as "Alice" file "/shared_file.txt" should exist in the trashbin
     And as "Brian" file "/shared_file.txt" should exist in the trashbin
 
-  @files_trashbin-app-required
+ 
   Scenario: deleting a folder out of a share as recipient creates a backup for the owner
     Given using OCS API version "1"
     And user "Alice" has created folder "/shared"
diff --git a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature
index 0d5ebb41040..cb2e80125e0 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 488e262c08d..b6e2d2085ba 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 e50e49e3182..9d1fc5d65fd 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 39189ee18ec..486481650a2 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 f2940ba0f4f..1f4be275444 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
@@ -54,7 +54,7 @@ Feature: moving a share inside another share
     And as "Alice" file "/folderA/localFolder/localFile.txt" should exist
     And as "Brian" file "/Shares/folderA/localFolder/localFile.txt" should exist
 
-  @skipOnOcV10
+  
   Scenario: share receiver tries to move a whole share inside a local folder
     Given user "Brian" has created folder "localFolder"
     And user "Brian" has uploaded file with content "local text" to "/localFolder/localFile.txt"
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature
index 463d0b38d3d..dcc64d3893b 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 ca9c696b795..3749136b85f 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 4192d6740d5..f22e74c897c 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 d5576bdf14b..d9a6b7283a8 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 b30e5178053..7fe4d6504fc 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 5914feb0d50..ec0205aaed0 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 eeb63bd4a71..af7ba6f9dd1 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 9baa881e47f..2ac882dbd46 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 3238d7511b2..0945bb0481e 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:
@@ -23,7 +23,7 @@ Feature: sharing
       | old      |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -154,7 +154,7 @@ Feature: sharing
       | old      |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature b/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature
index aea0625a890..07a79e817ce 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 73f63c38b34..77bee1d903e 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 24f6969c476..8d7c15ba77a 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 95f5c0e9554..b3911bdc0bf 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 1652046388e..8e4919acd34 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 6f6891fad79..51eb86c3125 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 02ee8025794..60ca1013287 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 a76cf3bba52..dd6d68c18e1 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 a0857b21a33..d06952d408c 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 f4b8be6c68d..e3c32cd8b94 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 91ac668d3dd..7c35754b680 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 7899c9e102c..9cfc6562cb7 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 f327673c471..f91afa8a19f 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:
@@ -10,7 +10,7 @@ Feature: resharing can be done on a reshared resource
       | Carol    |
       | David    |
 
-  @skipOnOcV10
+  
   Scenario: Reshared files can be still accessed if a user in the middle removes it.
     Given user "Alice" has uploaded file with content "ownCloud test text file 0" to "/textfile0.txt"
     And user "Alice" has shared file "textfile0.txt" with user "Brian"
diff --git a/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature b/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature
index a9781f79a9f..35870cddaf4 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 27d70912449..2e4dc821c13 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 f7ebf2d1f85..9e70ae3c094 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 3c178d8c44e..fa695e3bcdf 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 e7ddb069964..95bb8f396ef 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 3a18e07f695..9d193353fd6 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 2cffeffcd96..ffe96577d66 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/trashbinDelete.feature b/tests/acceptance/features/coreApiTrashbin/trashbinDelete.feature
index 278bcd4d3cf..dfc0c410282 100644
--- a/tests/acceptance/features/coreApiTrashbin/trashbinDelete.feature
+++ b/tests/acceptance/features/coreApiTrashbin/trashbinDelete.feature
@@ -1,4 +1,4 @@
-@api @files_trashbin-app-required @issue-1324
+@api @issue-1324
 Feature: files and folders can be deleted from the trashbin
   As a user
   I want to delete files and folders from the trashbin
@@ -29,7 +29,7 @@ Feature: files and folders can be deleted from the trashbin
       | new      | textfile0.txt | textfile1.txt |
       | new      | sample,0.txt  | sample,1.txt  |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path | filename1     | filename2     |
       | spaces   | textfile0.txt | textfile1.txt |
@@ -52,7 +52,7 @@ Feature: files and folders can be deleted from the trashbin
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -79,7 +79,7 @@ Feature: files and folders can be deleted from the trashbin
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -122,7 +122,7 @@ Feature: files and folders can be deleted from the trashbin
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -145,7 +145,7 @@ Feature: files and folders can be deleted from the trashbin
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -170,7 +170,7 @@ Feature: files and folders can be deleted from the trashbin
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -195,7 +195,7 @@ Feature: files and folders can be deleted from the trashbin
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -232,7 +232,7 @@ Feature: files and folders can be deleted from the trashbin
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -269,7 +269,7 @@ Feature: files and folders can be deleted from the trashbin
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -318,7 +318,7 @@ Feature: files and folders can be deleted from the trashbin
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature
index 2ebcba8e34b..5fa6aa8cfa0 100644
--- a/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature
+++ b/tests/acceptance/features/coreApiTrashbin/trashbinFilesFolders.feature
@@ -1,4 +1,4 @@
-@api @files_trashbin-app-required @issue-1324
+@api @issue-1324
 Feature: files and folders exist in the trashbin after being deleted
   As a user
   I want deleted files and folders to be available in the trashbin
@@ -19,7 +19,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -35,7 +35,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -54,12 +54,12 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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
@@ -75,12 +75,12 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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
@@ -94,7 +94,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -130,7 +130,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -153,24 +153,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
-    Examples:
-      | dav-path |
-      | spaces   |
-
-  @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 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      |
-
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -262,7 +245,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -281,7 +264,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -300,7 +283,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -323,7 +306,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | new      | -123     |
       | new      | 0.0      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path | username |
       | spaces   | dash-123 |
@@ -345,7 +328,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -365,7 +348,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -382,7 +365,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -419,7 +402,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -456,7 +439,7 @@ Feature: files and folders exist in the trashbin after being deleted
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature b/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature
index 09fc41e8ee8..80170355d89 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
 Feature: using trashbin together with sharing
 
   Background:
@@ -22,7 +22,7 @@ Feature: using trashbin together with sharing
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -44,7 +44,7 @@ Feature: using trashbin together with sharing
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -71,7 +71,7 @@ Feature: using trashbin together with sharing
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -98,7 +98,7 @@ Feature: using trashbin together with sharing
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -126,7 +126,7 @@ Feature: using trashbin together with sharing
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -154,7 +154,7 @@ Feature: using trashbin together with sharing
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -182,7 +182,7 @@ Feature: using trashbin together with sharing
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -205,7 +205,7 @@ Feature: using trashbin together with sharing
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
@@ -229,7 +229,7 @@ Feature: using trashbin together with sharing
       | dav-path |
       | new      |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav-path |
       | spaces   |
diff --git a/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature b/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature
index b538d7befe5..93d85733cfd 100644
--- a/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature
+++ b/tests/acceptance/features/coreApiTrashbinRestore/trashbinRestore.feature
@@ -1,4 +1,4 @@
-@api @files_trashbin-app-required @issue-1324
+@api @issue-1324
 Feature: Restore deleted files/folders
   As a user
   I would like to restore files/folders
@@ -130,41 +130,6 @@ Feature: Restore deleted files/folders
       | old      |
       | new      |
 
-  @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 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"
-    And as "Alice" the folder with original path "/local_storage/tmp/textfile0.txt" should exist in the trashbin
-    When user "Alice" restores the folder with original path "/local_storage/tmp/textfile0.txt" using the trashbin API
-    Then the HTTP status code should be "201"
-    And the following headers should match these regular expressions for user "Alice"
-      | ETag | /^"[a-f0-9:\.]{1,32}"$/ |
-    And as "Alice" the folder with original path "/local_storage/tmp/textfile0.txt" should not exist in the trashbin
-    And the content of file "/local_storage/tmp/textfile0.txt" for user "Alice" should be "file to delete"
-    And user "Alice" should see the following elements
-      | /local_storage/                  |
-      | /local_storage/tmp/              |
-      | /local_storage/tmp/textfile0.txt |
-    Examples:
-      | dav-path |
-      | old      |
-      | new      |
-
-  @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 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"
-    And user "Alice" has deleted file "/local_storage/tmp/textfile0.txt"
-    And as "Alice" the folder with original path "/local_storage/tmp/textfile0.txt" should exist in the trashbin
-    When user "Alice" restores the folder with original path "/local_storage/tmp/textfile0.txt" using the trashbin API
-    Then the HTTP status code should be "201"
-    And as "Alice" the folder with original path "/local_storage/tmp/textfile0.txt" should not exist in the trashbin
-    And the content of file "/local_storage/tmp/textfile0.txt" for user "Alice" should be "AA"
-
   @smokeTest
   Scenario Outline: A deleted file cannot be restored by a different user
     Given using <dav-path> DAV path
diff --git a/tests/acceptance/features/coreApiVersions/fileVersions.feature b/tests/acceptance/features/coreApiVersions/fileVersions.feature
index 6cb5e8300b8..b9ff765250a 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/coreApiWebdavDelete/deleteFile.feature b/tests/acceptance/features/coreApiWebdavDelete/deleteFile.feature
index a7806543151..bef0834a245 100644
--- a/tests/acceptance/features/coreApiWebdavDelete/deleteFile.feature
+++ b/tests/acceptance/features/coreApiWebdavDelete/deleteFile.feature
@@ -19,7 +19,7 @@ Feature: delete file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -39,7 +39,7 @@ Feature: delete file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -69,7 +69,7 @@ Feature: delete file
       | new         | /..upload     | abc         |
       | new         | /..upload     | ..abc       |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version    | folder_name   | file_name   |
       | spaces         | /upload.      | abc.        |
@@ -96,7 +96,7 @@ Feature: delete file
       | new         | ",,,.txt"      |
       | new         | ",,,.,"        |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version    | filename       |
       | spaces         | "sample,1.txt" |
@@ -125,7 +125,7 @@ Feature: delete file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version    |
       | spaces         |
diff --git a/tests/acceptance/features/coreApiWebdavDelete/deleteFolder.feature b/tests/acceptance/features/coreApiWebdavDelete/deleteFolder.feature
index b55254b7198..5e5a7ea2771 100644
--- a/tests/acceptance/features/coreApiWebdavDelete/deleteFolder.feature
+++ b/tests/acceptance/features/coreApiWebdavDelete/deleteFolder.feature
@@ -19,7 +19,7 @@ Feature: delete folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -37,7 +37,7 @@ Feature: delete folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -57,7 +57,7 @@ Feature: delete folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -86,7 +86,7 @@ Feature: delete folder
       | new         | /fo.xyz     |
       | new         | /fo.exe     |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | folder_name |
       | spaces      | /fo.        |
diff --git a/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature b/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature
index cb14fe4d4c4..c3582064cdf 100644
--- a/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature
+++ b/tests/acceptance/features/coreApiWebdavDelete/deleteFolderContents.feature
@@ -33,7 +33,7 @@ Feature: delete folder contents
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation1/deleteFileFolder.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation1/deleteFileFolder.feature
index c3aed4fbc38..d3d5d9cefcc 100644
--- a/tests/acceptance/features/coreApiWebdavEtagPropagation1/deleteFileFolder.feature
+++ b/tests/acceptance/features/coreApiWebdavEtagPropagation1/deleteFileFolder.feature
@@ -26,7 +26,7 @@ Feature: propagation of etags when deleting a file or folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -51,7 +51,7 @@ Feature: propagation of etags when deleting a file or folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -77,7 +77,7 @@ Feature: propagation of etags when deleting a file or folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -228,7 +228,7 @@ Feature: propagation of etags when deleting a file or folder
       | old         |
       | new         |
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -253,7 +253,7 @@ Feature: propagation of etags when deleting a file or folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation1/moveFileFolder.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation1/moveFileFolder.feature
index 2da76c5ae8e..35b3d0b0769 100644
--- a/tests/acceptance/features/coreApiWebdavEtagPropagation1/moveFileFolder.feature
+++ b/tests/acceptance/features/coreApiWebdavEtagPropagation1/moveFileFolder.feature
@@ -22,7 +22,7 @@ Feature: propagation of etags when moving files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -48,7 +48,7 @@ Feature: propagation of etags when moving files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -74,7 +74,7 @@ Feature: propagation of etags when moving files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -97,7 +97,7 @@ Feature: propagation of etags when moving files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -123,7 +123,7 @@ Feature: propagation of etags when moving files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -149,7 +149,7 @@ Feature: propagation of etags when moving files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -371,7 +371,7 @@ Feature: propagation of etags when moving files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -397,7 +397,7 @@ Feature: propagation of etags when moving files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature
index f3cffcc19e8..75cdeaabf9b 100644
--- a/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature
+++ b/tests/acceptance/features/coreApiWebdavEtagPropagation2/copyFileFolder.feature
@@ -25,7 +25,7 @@ Feature: propagation of etags when copying files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -52,7 +52,7 @@ Feature: propagation of etags when copying files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -80,7 +80,7 @@ Feature: propagation of etags when copying files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -113,7 +113,7 @@ Feature: propagation of etags when copying files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -146,7 +146,7 @@ Feature: propagation of etags when copying files or folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation2/createFolder.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation2/createFolder.feature
index a0daf67f5cc..460a985bd10 100644
--- a/tests/acceptance/features/coreApiWebdavEtagPropagation2/createFolder.feature
+++ b/tests/acceptance/features/coreApiWebdavEtagPropagation2/createFolder.feature
@@ -22,7 +22,7 @@ Feature: propagation of etags when creating folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -47,7 +47,7 @@ Feature: propagation of etags when creating folders
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -124,7 +124,7 @@ Feature: propagation of etags when creating folders
       | old         |
       | new         |
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavEtagPropagation2/upload.feature b/tests/acceptance/features/coreApiWebdavEtagPropagation2/upload.feature
index 561d3f11e9a..a875e7579ca 100644
--- a/tests/acceptance/features/coreApiWebdavEtagPropagation2/upload.feature
+++ b/tests/acceptance/features/coreApiWebdavEtagPropagation2/upload.feature
@@ -22,7 +22,7 @@ Feature: propagation of etags when uploading data
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -46,7 +46,7 @@ Feature: propagation of etags when uploading data
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -172,7 +172,7 @@ Feature: propagation of etags when uploading data
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature b/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature
index 10f3dfce604..6b1a9ca2f21 100644
--- a/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature
+++ b/tests/acceptance/features/coreApiWebdavLocks/exclusiveLocks.feature
@@ -21,13 +21,13 @@ Feature: there can be only one exclusive lock on a resource
       | new      | shared     |
       | new      | exclusive  |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope |
       | 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
@@ -48,13 +48,13 @@ Feature: there can be only one exclusive lock on a resource
       | new      | shared     |
       | new      | exclusive  |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope |
       | 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
@@ -75,13 +75,13 @@ Feature: there can be only one exclusive lock on a resource
       | new      | shared     |
       | new      | exclusive  |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope |
       | 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
@@ -102,7 +102,7 @@ Feature: there can be only one exclusive lock on a resource
       | new      | shared     |
       | new      | exclusive  |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope |
       | spaces   | shared     |
diff --git a/tests/acceptance/features/coreApiWebdavLocks/requestsWithToken.feature b/tests/acceptance/features/coreApiWebdavLocks/requestsWithToken.feature
index bd30692094b..5290ae5175e 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/coreApiWebdavLocks2/independentLocks.feature b/tests/acceptance/features/coreApiWebdavLocks2/independentLocks.feature
index b7d99841e51..3fcce95f2e1 100644
--- a/tests/acceptance/features/coreApiWebdavLocks2/independentLocks.feature
+++ b/tests/acceptance/features/coreApiWebdavLocks2/independentLocks.feature
@@ -25,7 +25,7 @@ Feature: independent locks
       | new      | shared     |
       | new      | exclusive  |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope |
       | spaces   | shared     |
@@ -57,7 +57,7 @@ Feature: independent locks
       | new      | exclusive  | .git       | config   | .git        |
       | new      | exclusive  | .git       | config   | .git/config |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope | foldername | filename | to-lock     |
       | spaces   | shared     | .git       | config   | .git        |
diff --git a/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature b/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature
index e8ccfc802d4..ad3387f996f 100644
--- a/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature
+++ b/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature
@@ -31,7 +31,7 @@ Feature: independent locks
       | new      | shared     |
       | new      | exclusive  |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope |
       | spaces   | shared     |
@@ -60,7 +60,7 @@ Feature: independent locks
       | new      | shared     |
       | new      | exclusive  |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope |
       | spaces   | shared     |
diff --git a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature
index 4a3b5930375..d300715baac 100644
--- a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature
+++ b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlock.feature
@@ -20,12 +20,12 @@ Feature: UNLOCK locked items
       | old      |
       | new      |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | 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"
@@ -65,7 +65,7 @@ Feature: UNLOCK locked items
       | new      | shared     |
       | new      | exclusive  |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope |
       | spaces   | shared     |
diff --git a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature
index 4a5d00f339b..f439cb98e2e 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:
@@ -28,7 +28,7 @@ Feature: UNLOCK locked items (sharing)
       | new      | shared     | /parent.txt        |
       | new      | exclusive  | /parent.txt        |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope | pending_share_path |
       | spaces   | shared     | /parent.txt        |
@@ -52,7 +52,7 @@ Feature: UNLOCK locked items (sharing)
       | new      | shared     |
       | new      | exclusive  |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope |
       | spaces   | shared     |
@@ -76,7 +76,7 @@ Feature: UNLOCK locked items (sharing)
       | new      | shared     | /parent.txt        |
       | new      | exclusive  | /parent.txt        |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope | pending_share_path |
       | spaces   | shared     | /parent.txt        |
@@ -100,7 +100,7 @@ Feature: UNLOCK locked items (sharing)
       | new      | shared     | /parent.txt        |
       | new      | exclusive  | /parent.txt        |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope | pending_share_path |
       | spaces   | shared     | /parent.txt        |
@@ -124,7 +124,7 @@ Feature: UNLOCK locked items (sharing)
       | new      | shared     |
       | new      | exclusive  |
 
-    @personalSpace @skipOnOcV10
+    @personalSpace 
     Examples:
       | dav-path | lock-scope |
       | spaces   | shared     |
diff --git a/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature b/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature
index 6d8768ec0f4..9184a4ba608 100644
--- a/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature
+++ b/tests/acceptance/features/coreApiWebdavMove1/moveFolder.feature
@@ -21,7 +21,7 @@ Feature: move (rename) folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -39,7 +39,7 @@ Feature: move (rename) folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -57,7 +57,7 @@ Feature: move (rename) folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -78,7 +78,7 @@ Feature: move (rename) folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -96,7 +96,7 @@ Feature: move (rename) folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -122,7 +122,7 @@ Feature: move (rename) folder
       | new         | /...          |
       | new         | /..upload     |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | folder_name   |
       | spaces      | /upload.      |
@@ -147,7 +147,7 @@ Feature: move (rename) folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavMove1/moveFolderToBlacklistedName.feature b/tests/acceptance/features/coreApiWebdavMove1/moveFolderToBlacklistedName.feature
index 4682c63cdff..183f874a730 100644
--- a/tests/acceptance/features/coreApiWebdavMove1/moveFolderToBlacklistedName.feature
+++ b/tests/acceptance/features/coreApiWebdavMove1/moveFolderToBlacklistedName.feature
@@ -21,7 +21,7 @@ Feature: users cannot move (rename) a folder to a blacklisted name
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature b/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature
index 8b94020fd9c..a7cb0213d3f 100644
--- a/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature
+++ b/tests/acceptance/features/coreApiWebdavMove2/moveFile.feature
@@ -23,7 +23,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -43,7 +43,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -61,7 +61,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -80,7 +80,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -100,7 +100,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -116,7 +116,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -132,7 +132,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -153,7 +153,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -176,7 +176,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -204,7 +204,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -222,7 +222,7 @@ Feature: move (rename) file
       | old         | #oc ab?cd=ef# |
       | new         | #oc ab?cd=ef# |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | renamed_file  |
       | spaces      | #oc ab?cd=ef# |
@@ -250,7 +250,7 @@ Feature: move (rename) file
       | new         | /...          | ...         |
       | new         | /..upload     | ..abc       |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | folder_name   | file_name   |
       | spaces      | /upload.      | abc.        |
@@ -272,7 +272,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -288,7 +288,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -319,7 +319,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -349,7 +349,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -384,7 +384,7 @@ Feature: move (rename) file
       | new         | texta         | file.txt    | textb         | 0           |
       | new         | texta         | file.txt    | textb         | 1           |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | source_folder | source_file | target_folder | target_file |
       | spaces      | text          | file.txt    | 0             | file.txt    |
@@ -421,7 +421,7 @@ Feature: move (rename) file
       | new         | texta         | file.txt    | 0           |
       | new         | texta         | file.txt    | 0           |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | source_folder | source_file | target_file |
       | spaces      | 0             | file.txt    | file.txt    |
@@ -445,7 +445,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -463,7 +463,7 @@ Feature: move (rename) file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature b/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature
index dcddd023db4..ef806bc71ed 100644
--- a/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature
+++ b/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature
@@ -19,7 +19,7 @@ Feature: users cannot move (rename) a file to a blacklisted name
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature b/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature
index 9e5f929f6d6..954a98a76dc 100644
--- a/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature
+++ b/tests/acceptance/features/coreApiWebdavMove2/moveShareOnOcis.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcV10
+@api 
 Feature: move (rename) file
   As a user
   I want to be able to move and rename files
diff --git a/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature b/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature
index 2171338cabf..2ab841d187f 100644
--- a/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature
+++ b/tests/acceptance/features/coreApiWebdavOperations/downloadFile.feature
@@ -20,7 +20,7 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -36,7 +36,7 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -54,7 +54,7 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -72,7 +72,7 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -91,7 +91,7 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -110,7 +110,7 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -131,7 +131,7 @@ Feature: download file
       | new         | ",,,.txt"      |
       | new         | ",,,.,"        |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | filename          |
       | spaces         | "sample,1.txt" |
@@ -153,7 +153,7 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -184,7 +184,7 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -200,7 +200,7 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -216,7 +216,7 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -231,7 +231,7 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -258,12 +258,12 @@ Feature: download file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
 
-  @smokeTest @skipOnOcV10
+  @smokeTest 
   Scenario Outline: Downloading a file should serve security headers
     Given using <dav_version> DAV path
     When user "Alice" downloads file "/welcome.txt" using the WebDAV API
diff --git a/tests/acceptance/features/coreApiWebdavOperations/listFiles.feature b/tests/acceptance/features/coreApiWebdavOperations/listFiles.feature
index b9dfd0009d4..710d92c1aed 100644
--- a/tests/acceptance/features/coreApiWebdavOperations/listFiles.feature
+++ b/tests/acceptance/features/coreApiWebdavOperations/listFiles.feature
@@ -42,7 +42,7 @@ Feature: list files
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -68,7 +68,7 @@ Feature: list files
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -97,7 +97,7 @@ Feature: list files
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -121,7 +121,7 @@ Feature: list files
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -149,7 +149,7 @@ Feature: list files
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -174,7 +174,7 @@ Feature: list files
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -285,7 +285,7 @@ Feature: list files
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -318,7 +318,7 @@ Feature: list files
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -349,7 +349,7 @@ Feature: list files
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -364,7 +364,7 @@ Feature: list files
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -383,7 +383,7 @@ Feature: list files
       | dav_version |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -403,7 +403,7 @@ Feature: list files
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavOperations/propfind.feature b/tests/acceptance/features/coreApiWebdavOperations/propfind.feature
index 3a169073688..a3714195ec6 100644
--- a/tests/acceptance/features/coreApiWebdavOperations/propfind.feature
+++ b/tests/acceptance/features/coreApiWebdavOperations/propfind.feature
@@ -10,7 +10,7 @@ Feature: PROPFIND
       | dav_path                      |
       | /remote.php/dav/files         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_path                      |
       | /remote.php/dav/spaces        |
diff --git a/tests/acceptance/features/coreApiWebdavOperations/refuseAccess.feature b/tests/acceptance/features/coreApiWebdavOperations/refuseAccess.feature
index cb51ce29abe..b046548c957 100644
--- a/tests/acceptance/features/coreApiWebdavOperations/refuseAccess.feature
+++ b/tests/acceptance/features/coreApiWebdavOperations/refuseAccess.feature
@@ -35,7 +35,7 @@ Feature: refuse access
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version    |
       | spaces         |
\ No newline at end of file
diff --git a/tests/acceptance/features/coreApiWebdavOperations/search.feature b/tests/acceptance/features/coreApiWebdavOperations/search.feature
index b2bc0f7cdf0..b7dcd39d6ba 100644
--- a/tests/acceptance/features/coreApiWebdavOperations/search.feature
+++ b/tests/acceptance/features/coreApiWebdavOperations/search.feature
@@ -42,7 +42,7 @@ Feature: Search
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -64,7 +64,7 @@ Feature: Search
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -87,7 +87,7 @@ Feature: Search
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -102,7 +102,7 @@ Feature: Search
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -126,7 +126,7 @@ Feature: Search
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -150,7 +150,7 @@ Feature: Search
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -175,7 +175,7 @@ Feature: Search
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -208,7 +208,7 @@ Feature: Search
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -240,7 +240,7 @@ Feature: Search
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -265,7 +265,7 @@ Feature: Search
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature b/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature
index 67af450b66e..c3f3980c8a7 100644
--- a/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature
+++ b/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature
@@ -23,7 +23,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -39,7 +39,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -57,12 +57,12 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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
@@ -119,7 +119,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -138,7 +138,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -156,7 +156,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -178,7 +178,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -202,7 +202,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -225,7 +225,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -249,7 +249,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -409,7 +409,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -435,7 +435,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -562,7 +562,7 @@ Feature: copy file
       | old         |
       | new         |
 
-  @skipOnOcV10 @personalSpace
+  @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -579,7 +579,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -595,7 +595,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -613,12 +613,12 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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
@@ -725,12 +725,12 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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
@@ -838,7 +838,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -859,7 +859,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -880,7 +880,7 @@ Feature: copy file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavProperties1/createFileFolder.feature b/tests/acceptance/features/coreApiWebdavProperties1/createFileFolder.feature
index 9a4ccc19a8a..dd6cba6249f 100644
--- a/tests/acceptance/features/coreApiWebdavProperties1/createFileFolder.feature
+++ b/tests/acceptance/features/coreApiWebdavProperties1/createFileFolder.feature
@@ -33,7 +33,7 @@ Feature: create files and folder
       | new         | /😀 🤖          |
       | new         | /new&folder     |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | folder_name |
       | spaces      | /upload         |
@@ -59,7 +59,7 @@ Feature: create files and folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -78,7 +78,7 @@ Feature: create files and folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -98,7 +98,7 @@ Feature: create files and folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -117,7 +117,7 @@ Feature: create files and folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -136,7 +136,7 @@ Feature: create files and folder
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -167,7 +167,7 @@ Feature: create files and folder
       | new         | /😀 🤖.txt       |
       | new         | /new&file.txt    |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | file_name        |
       | spaces      | /upload.txt      |
diff --git a/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature b/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature
index faaa9c9495c..b3272f69dd9 100644
--- a/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature
+++ b/tests/acceptance/features/coreApiWebdavProperties1/getQuota.feature
@@ -19,7 +19,7 @@ Feature: get quota
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -35,12 +35,12 @@ Feature: get quota
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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
@@ -62,7 +62,7 @@ Feature: get quota
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -82,12 +82,12 @@ Feature: get quota
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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
@@ -104,7 +104,7 @@ Feature: get quota
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature b/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature
index 7211ca04141..0a6397bc788 100644
--- a/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature
+++ b/tests/acceptance/features/coreApiWebdavProperties1/setFileProperties.feature
@@ -20,7 +20,7 @@ Feature: set file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -37,7 +37,7 @@ Feature: set file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -55,12 +55,12 @@ Feature: set file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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
@@ -78,7 +78,7 @@ Feature: set file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -96,7 +96,7 @@ Feature: set file properties
       | old                | new               |
       | new                | old               |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | action_dav_version | other_dav_version |
       | spaces             | new               |
diff --git a/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature b/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature
index ab826b4945e..5cc99262294 100644
--- a/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature
+++ b/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature
@@ -26,7 +26,7 @@ Feature: get file properties
       | new         | /नेपाली.txt         |
       | new         | s,a,m,p,l,e.txt   |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | file_name         |
       | spaces      | /upload.txt       |
@@ -53,7 +53,7 @@ Feature: get file properties
       | new         | /file ?2.txt  | remote.php/dav/files/%username%/file ?2.txt   |
       | new         | /file &2.txt  | remote.php/dav/files/%username%/file &2.txt   |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | file_name     | expected_href                     |
       | spaces      | /C++ file.cpp | dav/spaces/%spaceid%/C++ file.cpp |
@@ -89,7 +89,7 @@ Feature: get file properties
       | new         | /folder ?2.txt  | remote.php/dav/files/%username%/folder ?2.txt  |
       | new         | /folder &2.txt  | remote.php/dav/files/%username%/folder &2.txt  |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | folder_name     | expected_href                       |
       | spaces      | /upload         | dav/spaces/%spaceid%/upload         |
@@ -121,7 +121,7 @@ Feature: get file properties
       | new         | /नेपाली                          | नेपाली                        |
       | new         | /folder #2.txt                   | file #2.txt                   |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | folder_name     | file_name        |
       | spaces      | /upload         | abc.txt          |
@@ -144,7 +144,7 @@ Feature: get file properties
       | old         | /folder ?2.txt | file ?2.txt |
       | new         | /folder ?2.txt | file ?2.txt |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | folder_name    | file_name   |
       | spaces      | /folder ?2.txt | file ?2.txt |
@@ -163,12 +163,12 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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
@@ -189,12 +189,12 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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
@@ -215,12 +215,12 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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"
@@ -238,12 +238,12 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | 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
@@ -275,7 +275,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -294,7 +294,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -340,12 +340,12 @@ Feature: get file properties
       | dav_version |
       | new         |
 
-    @skipOnOcV10
+    
     Examples:
       | dav_version |
       | old         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -380,12 +380,12 @@ Feature: get file properties
       | dav_version |
       | new         |
 
-    @skipOnOcV10
+    
     Examples:
       | dav_version |
       | old         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -404,7 +404,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -423,7 +423,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -442,7 +442,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -461,7 +461,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -480,7 +480,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -499,7 +499,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -518,7 +518,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -537,7 +537,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -556,7 +556,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -575,7 +575,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -594,7 +594,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -613,7 +613,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -632,7 +632,7 @@ Feature: get file properties
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavUpload1/uploadFile.feature b/tests/acceptance/features/coreApiWebdavUpload1/uploadFile.feature
index 02805b519df..227db90f7bd 100644
--- a/tests/acceptance/features/coreApiWebdavUpload1/uploadFile.feature
+++ b/tests/acceptance/features/coreApiWebdavUpload1/uploadFile.feature
@@ -27,7 +27,7 @@ Feature: upload file
       | new         | /strängé file.txt |
       | new         | /s,a,m,p,l,e.txt  |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | file_name         |
       | spaces      | /upload.txt       |
@@ -48,7 +48,7 @@ Feature: upload file
       | new         | "C++ file.cpp" |
       | new         | "file #2.txt"  |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | file_name      |
       | spaces      | "C++ file.cpp" |
@@ -70,7 +70,7 @@ Feature: upload file
       | new         | " ?fi=le&%#2 . txt" |
       | new         | " # %ab ab?=ed "    |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | file_name           |
       | spaces      | "file ?2.txt"       |
@@ -92,7 +92,7 @@ Feature: upload file
       | new         | ",,,.txt"      |
       | new         | ",,,.,"        |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | file_name      |
       | spaces      | "sample,1.txt" |
@@ -119,7 +119,7 @@ Feature: upload file
       | new         | /नेपाली                          | नेपाली                        |
       | new         | /folder #2.txt                   | file #2.txt                   |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | folder_name     | file_name        |
       | spaces      | /strängé folder | strängé file.txt |
@@ -143,7 +143,7 @@ Feature: upload file
       | new         | /folder ?2.txt    | file ?2.txt  |
       | new         | /?fi=le&%#2 . txt | # %ab ab?=ed |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | folder_name       | file_name    |
       | spaces      | /folder ?2.txt    | file ?2.txt  |
@@ -161,7 +161,7 @@ Feature: upload file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -181,7 +181,7 @@ Feature: upload file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -208,7 +208,7 @@ Feature: upload file
       | new         | /upload...1.. | abc...txt.. |
       | new         | /...          | ...         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | folder_name   | file_name   |
       | spaces      | /upload.      | abc.        |
@@ -229,7 +229,7 @@ Feature: upload file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -247,7 +247,7 @@ Feature: upload file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -266,7 +266,7 @@ Feature: upload file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -285,7 +285,7 @@ Feature: upload file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -312,7 +312,7 @@ Feature: upload file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -328,7 +328,7 @@ Feature: upload file
       | old         |
       | new         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
diff --git a/tests/acceptance/features/coreApiWebdavUpload2/uploadFileUsingOldChunking.feature b/tests/acceptance/features/coreApiWebdavUpload2/uploadFileUsingOldChunking.feature
index 7803767ff09..22b3708c1e6 100644
--- a/tests/acceptance/features/coreApiWebdavUpload2/uploadFileUsingOldChunking.feature
+++ b/tests/acceptance/features/coreApiWebdavUpload2/uploadFileUsingOldChunking.feature
@@ -45,7 +45,7 @@ Feature: upload file using old chunking
       | dav_version |
       | old         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -65,7 +65,7 @@ Feature: upload file using old chunking
       | dav_version |
       | old         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -89,7 +89,7 @@ Feature: upload file using old chunking
       | dav_version |
       | old         |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version |
       | spaces      |
@@ -114,7 +114,7 @@ Feature: upload file using old chunking
       | old         | &#? TIÄFÜ @a#8a=b?c=d ?abc=oc # |
       | old         | 0                               |
 
-    @skipOnOcV10 @personalSpace
+    @personalSpace
     Examples:
       | dav_version | file-name                       |
       | spaces      | &#? TIÄFÜ @a#8a=b?c=d ?abc=oc # |
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/checksums.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/checksums.feature
index 3eeb77f31dd..ffc0c089c93 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/checksums.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/checksums.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: checksums
 
   Background:
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/creationWithUploadExtension.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/creationWithUploadExtension.feature
index 8a8c57e6091..a03fa2db7c7 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/creationWithUploadExtension.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/creationWithUploadExtension.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: tests of the creation extension see https://tus.io/protocols/resumable-upload.html#creation-with-upload
 
   Background:
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelCreationExtension.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelCreationExtension.feature
index 3340ed9eead..81b6a395efa 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelCreationExtension.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelCreationExtension.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: low level tests of the creation extension see https://tus.io/protocols/resumable-upload.html#creation
 
   Background:
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelUpload.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelUpload.feature
index 02fba4390d6..79fecc8ac23 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelUpload.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/lowLevelUpload.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: low level tests for upload of chunks
 
   Background:
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/optionsRequest.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/optionsRequest.feature
index c41fddbd83b..14c48270246 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/optionsRequest.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/optionsRequest.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: OPTIONS request
 
   Background:
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature
index bea7de061fc..eae25a48cf0 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFile.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: upload file
   As a user
   I want to be able to upload files
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature
index c54b451f691..60b05cd14c2 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@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/uploadFileMtimeShares.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature
index 9ba7357d7d9..8704bc16a2f 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcV10
+@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/uploadToMoveFolder.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToMoveFolder.feature
index 99bbf7caba9..c4868d23352 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToMoveFolder.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToMoveFolder.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: move folders
   As a user
   I want to be able to move and upload files/folders
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature
index 02b59654e6e..98c1627466a 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToNonExistingFolder.feature
@@ -1,4 +1,4 @@
-@api @skipOnOcV10
+@api 
 Feature: upload file
   As a user
   I want to try uploading files to a nonexistent folder
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature
index a4ac05205f4..9e96c8bf100 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature
@@ -1,4 +1,4 @@
-@api @files_sharing-app-required @skipOnOcV10
+@api 
 
 Feature: upload file to shared folder