diff --git a/.drone.star b/.drone.star
index d9d3742548..2fd08ba706 100644
--- a/.drone.star
+++ b/.drone.star
@@ -347,6 +347,7 @@ def testPipelines(ctx):
         pipelines += [
             localApiTests(ctx, "ocis", "apiAccountsHashDifficulty"),
             localApiTests(ctx, "ocis", "apiSpaces"),
+            localApiTests(ctx, "ocis", "apiSpacesShares"),
             localApiTests(ctx, "ocis", "apiArchiver"),
             localApiTests(ctx, "ocis", "apiGraph"),
         ]
diff --git a/tests/acceptance/config/behat.yml b/tests/acceptance/config/behat.yml
index 956f2c3cc6..a90da2fb3e 100644
--- a/tests/acceptance/config/behat.yml
+++ b/tests/acceptance/config/behat.yml
@@ -51,6 +51,26 @@ default:
         - TUSContext:
         - SpacesTUSContext:
 
+    apiSpacesShares:
+      paths:
+        - '%paths.base%/../features/apiSpacesShares'
+      context: *common_ldap_suite_context
+      contexts:
+        - SpacesContext:
+        - OccContext:
+        - FeatureContext: *common_feature_context_params
+        - CapabilitiesContext:
+        - ChecksumContext:
+        - FavoritesContext:
+        - FilesVersionsContext:
+        - OCSContext:
+        - PublicWebDavContext:
+        - SearchContext:
+        - TrashbinContext:
+        - WebDavPropertiesContext:
+        - TUSContext:
+        - SpacesTUSContext:
+
     apiArchiver:
       paths:
         - '%paths.base%/../features/apiArchiver'
diff --git a/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md
index edc0e4fcc9..97d70fbb5d 100644
--- a/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-localAPI-on-OCIS-storage.md
@@ -24,16 +24,16 @@ The expected failures in this file are from features in the owncloud/ocis repo.
 - [apiGraph/createGroupCaseSensitive.feature:21](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiGraph/createGroupCaseSensitive.feature#L21)
 
 ### [PROPFIND on accepted shares with identical names containing brackets exit with 404](https://github.com/owncloud/ocis/issues/4421)
-- [apiSpaces/changingFilesShare.feature:12](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/changingFilesShare.feature#L12)
+- [apiSpacesShares/changingFilesShare.feature:12](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/changingFilesShare.feature#L12)
 
 ### [copy to overwrite (file and folder) from Personal to Shares Jail behaves differently](https://github.com/owncloud/ocis/issues/4393)
-- [apiSpaces/copySpaces.feature:488](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/copySpaces.feature#L488)
-- [apiSpaces/copySpaces.feature:502](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/copySpaces.feature#L502)
+- [apiSpacesShares/copySpaces.feature:488](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/copySpaces.feature#L488)
+- [apiSpacesShares/copySpaces.feature:502](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/copySpaces.feature#L502)
 
 ### [search doesn't find the project space by name](https://github.com/owncloud/ocis/issues/4506)
 - [apiSpaces/search.feature:95](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/search.feature#L95)
 
 #### [PATCH request for TUS upload with wrong checksum gives incorrect response](https://github.com/owncloud/ocis/issues/1755)
-- [apiSpaces/shareUploadTUS.feature:204](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/shareUploadTUS.feature#L204)
-- [apiSpaces/shareUploadTUS.feature:219](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/shareUploadTUS.feature#L219)
-- [apiSpaces/shareUploadTUS.feature:284](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpaces/shareUploadTUS.feature#L284)
+- [apiSpacesShares/shareUploadTUS.feature:204](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature#L204)
+- [apiSpacesShares/shareUploadTUS.feature:219](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature#L219)
+- [apiSpacesShares/shareUploadTUS.feature:284](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature#L284)
diff --git a/tests/acceptance/features/apiSpaces/changingFilesShare.feature b/tests/acceptance/features/apiSpacesShares/changingFilesShare.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/changingFilesShare.feature
rename to tests/acceptance/features/apiSpacesShares/changingFilesShare.feature
diff --git a/tests/acceptance/features/apiSpaces/checksum.feature b/tests/acceptance/features/apiSpacesShares/checksum.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/checksum.feature
rename to tests/acceptance/features/apiSpacesShares/checksum.feature
diff --git a/tests/acceptance/features/apiSpaces/copySpaces.feature b/tests/acceptance/features/apiSpacesShares/copySpaces.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/copySpaces.feature
rename to tests/acceptance/features/apiSpacesShares/copySpaces.feature
diff --git a/tests/acceptance/features/apiSpaces/createFileFolderWhenSharesSpaceExist.feature b/tests/acceptance/features/apiSpacesShares/createFileFolderWhenSharesSpaceExist.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/createFileFolderWhenSharesSpaceExist.feature
rename to tests/acceptance/features/apiSpacesShares/createFileFolderWhenSharesSpaceExist.feature
diff --git a/tests/acceptance/features/apiSpaces/etagPropagation.feature b/tests/acceptance/features/apiSpacesShares/etagPropagation.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/etagPropagation.feature
rename to tests/acceptance/features/apiSpacesShares/etagPropagation.feature
diff --git a/tests/acceptance/features/apiSpaces/favorite.feature b/tests/acceptance/features/apiSpacesShares/favorite.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/favorite.feature
rename to tests/acceptance/features/apiSpacesShares/favorite.feature
diff --git a/tests/acceptance/features/apiSpaces/moveSpaces.feature b/tests/acceptance/features/apiSpacesShares/moveSpaces.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/moveSpaces.feature
rename to tests/acceptance/features/apiSpacesShares/moveSpaces.feature
diff --git a/tests/acceptance/features/apiSpaces/shareOperations.feature b/tests/acceptance/features/apiSpacesShares/shareOperations.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/shareOperations.feature
rename to tests/acceptance/features/apiSpacesShares/shareOperations.feature
diff --git a/tests/acceptance/features/apiSpaces/shareSpaces.feature b/tests/acceptance/features/apiSpacesShares/shareSpaces.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/shareSpaces.feature
rename to tests/acceptance/features/apiSpacesShares/shareSpaces.feature
diff --git a/tests/acceptance/features/apiSpaces/shareSpacesViaLink.feature b/tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/shareSpacesViaLink.feature
rename to tests/acceptance/features/apiSpacesShares/shareSpacesViaLink.feature
diff --git a/tests/acceptance/features/apiSpaces/shareSubItemOfSpace.feature b/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpace.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/shareSubItemOfSpace.feature
rename to tests/acceptance/features/apiSpacesShares/shareSubItemOfSpace.feature
diff --git a/tests/acceptance/features/apiSpaces/shareSubItemOfSpaceViaPublicLink.feature b/tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/shareSubItemOfSpaceViaPublicLink.feature
rename to tests/acceptance/features/apiSpacesShares/shareSubItemOfSpaceViaPublicLink.feature
diff --git a/tests/acceptance/features/apiSpaces/shareUploadTUS.feature b/tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature
similarity index 100%
rename from tests/acceptance/features/apiSpaces/shareUploadTUS.feature
rename to tests/acceptance/features/apiSpacesShares/shareUploadTUS.feature