diff --git a/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature b/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature
index 4045ef9c1d..eb26c6e9b1 100644
--- a/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature
+++ b/tests/acceptance/features/apiAccountsHashDifficulty/createShareToSharesFolder.feature
@@ -9,8 +9,7 @@ Feature: sharing
 
 
   Scenario Outline: creating a share of a file with a user
-    Given auto-accept shares has been disabled
-    And using OCS API version "<ocs_api_version>"
+    Given using OCS API version "<ocs_api_version>"
     And user "Alice" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "ownCloud test text file 0" to "/textfile0.txt"
     And user "Brian" has been created with default attributes and without skeleton files
diff --git a/tests/acceptance/features/apiSpacesShares/checksum.feature b/tests/acceptance/features/apiSpacesShares/checksum.feature
index fe0a78ff8d..a38b49208e 100644
--- a/tests/acceptance/features/apiSpacesShares/checksum.feature
+++ b/tests/acceptance/features/apiSpacesShares/checksum.feature
@@ -6,7 +6,6 @@ Feature: checksums
 
   Background:
     Given user "Alice" has been created with default attributes and without skeleton files
-    And auto-accept shares has been disabled
     And using spaces DAV path
     And user "Brian" has been created with default attributes and without skeleton files
 
diff --git a/tests/acceptance/features/bootstrap/Sharing.php b/tests/acceptance/features/bootstrap/Sharing.php
index 6a5e911df7..cd3f619887 100644
--- a/tests/acceptance/features/bootstrap/Sharing.php
+++ b/tests/acceptance/features/bootstrap/Sharing.php
@@ -394,17 +394,6 @@ trait Sharing {
 		);
 	}
 
-	/**
-	 * @Given auto-accept shares has been disabled
-	 *
-	 * @return void
-	 */
-	public function autoAcceptSharesHasBeenDisabled():void {
-		// auto-accept shares is disabled by default on OCIS.
-		// so there is nothing to do, just return
-		return;
-	}
-
 	/**
 	 * @When /^user "([^"]*)" creates a share using the sharing API with settings$/
 	 *
diff --git a/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature b/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature
index 7defe28955..a52e5e3178 100644
--- a/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature
+++ b/tests/acceptance/features/coreApiFavorites/favoritesSharingToShares.feature
@@ -5,8 +5,7 @@ Feature: favorite
   So that I can access them quickly
 
   Background:
-    Given auto-accept shares has been disabled
-    And user "Alice" has been created with default attributes and without skeleton files
+    Given user "Alice" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/PARENT"
     And user "Alice" has uploaded file with content "some data" to "/PARENT/parent.txt"
 
diff --git a/tests/acceptance/features/coreApiMain/checksums.feature b/tests/acceptance/features/coreApiMain/checksums.feature
index b9785b1844..4f42905c56 100644
--- a/tests/acceptance/features/coreApiMain/checksums.feature
+++ b/tests/acceptance/features/coreApiMain/checksums.feature
@@ -177,8 +177,7 @@ Feature: checksums
 
   @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
+    Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
     And 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"
@@ -192,8 +191,7 @@ Feature: checksums
 
   @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
+    Given using <dav_version> DAV path
     And user "Brian" has been created with default attributes and without skeleton files
     And 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/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature
index e9b8939bfa..f20d9e95f0 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareResourceCaseSensitiveName.feature
@@ -5,8 +5,7 @@ Feature: Sharing resources with different case names with the sharee and checkin
   So that I can make sure that the shares aren't case sensitive
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature
index 883a31e80a..a74e59c3ec 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares1/createShareUniqueReceivedNames.feature
@@ -5,8 +5,7 @@ Feature: resources shared with the same name are received with unique names
   So that I can make sure the naming is handled properly by the server
 
   Background:
-    Given auto-accept shares has been disabled
-    And using OCS API version "1"
+    Given using OCS API version "1"
     And these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature
index 77559e7c1a..f0eb81eeef 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareDefaultFolderForReceivedShares.feature
@@ -5,8 +5,7 @@ Feature: shares are received in the default folder for received shares
   So that I can make sure it does not work
 
   Background:
-    Given auto-accept shares has been disabled
-    And user "Alice" has been created with default attributes and without skeleton files
+    Given user "Alice" has been created with default attributes and without skeleton files
 
 
   Scenario Outline: do not allow sharing of the entire share folder
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature
index 816e884aff..21a9a2b4f8 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareGroupAndUserWithSameName.feature
@@ -5,8 +5,7 @@ Feature: sharing works when a username and group name are the same
   So that I can make sure that the sharing works
 
   Background:
-    Given auto-accept shares has been disabled
-    And user "Alice" has been created with default attributes and without skeleton files
+    Given user "Alice" has been created with default attributes and without skeleton files
 
   @skipOnLDAP
   Scenario: creating a new share with user and a group having same name
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature
index 30b573eeeb..7c2d3bf02c 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareReceivedInMultipleWays.feature
@@ -5,8 +5,7 @@ Feature: share resources where the sharee receives the share in multiple ways
   So that I can make sure that the sharing works
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature
index 3d4be97ec9..e688df3581 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithDisabledUser.feature
@@ -5,8 +5,7 @@ Feature: share resources with a disabled user
   So that I can make sure it doesn't work
 
   Background:
-    Given auto-accept shares has been disabled
-    And user "Alice" has been created with default attributes and without skeleton files
+    Given user "Alice" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file "filesForUpload/textfile.txt" to "/textfile0.txt"
 
   @issue-2212
diff --git a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature
index c4629b459b..fd7d524679 100644
--- a/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature
+++ b/tests/acceptance/features/coreApiShareCreateSpecialToShares2/createShareWithInvalidPermissions.feature
@@ -5,8 +5,7 @@ Feature: cannot share resources with invalid permissions
   So that I can make sure it doesn't work
 
   Background:
-    Given auto-accept shares has been disabled
-    And user "Alice" has been created with default attributes and without skeleton files
+    Given user "Alice" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "some data" to "/textfile0.txt"
     And user "Alice" has created folder "/PARENT"
 
diff --git a/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature b/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature
index 7e7d8003d3..25d3f49efb 100644
--- a/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature
+++ b/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature
@@ -5,8 +5,7 @@ Feature: sharing
   So that they can have access on them
 
   Background:
-    Given auto-accept shares has been disabled
-    And user "Alice" has been created with default attributes and without skeleton files
+    Given user "Alice" has been created with default attributes and without skeleton files
 
   @smokeTest
   Scenario Outline: creating a share of a file with a user, the default permissions are read(1)+update(2)+can-share(16)
diff --git a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature
index 597ac6c06c..3bd6210a7d 100644
--- a/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature
+++ b/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature
@@ -5,8 +5,7 @@ Feature: sharing
   So that I don't have redundant shares
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature
index 819c0a0f33..cfd136642b 100644
--- a/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature
+++ b/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature
@@ -5,8 +5,7 @@ Feature: accept/decline shares coming from internal users
   So that I can keep my file system clean
 
   Background:
-    Given auto-accept shares has been disabled
-    And using OCS API version "1"
+    Given using OCS API version "1"
     And using new DAV path
     And these users have been created with default attributes and without skeleton files:
       | username |
diff --git a/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature
index 45032d84c8..87d304bb74 100644
--- a/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature
+++ b/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature
@@ -2,8 +2,7 @@
 Feature: sharing
 
   Background:
-    Given auto-accept shares has been disabled
-    And using OCS API version "1"
+    Given using OCS API version "1"
     And these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
diff --git a/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature
index dbba7112f1..76c46d9fb0 100644
--- a/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature
+++ b/tests/acceptance/features/coreApiShareManagementToShares/moveReceivedShare.feature
@@ -2,8 +2,7 @@
 Feature: sharing
 
   Background:
-    Given auto-accept shares has been disabled
-    And using OCS API version "1"
+    Given using OCS API version "1"
     And these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
diff --git a/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature
index c6caac893b..8a27bb5bd8 100644
--- a/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature
+++ b/tests/acceptance/features/coreApiShareManagementToShares/moveShareInsideAnotherShare.feature
@@ -5,8 +5,7 @@ Feature: moving a share inside another share
   So that I have full flexibility when managing resources
 
   Background:
-    Given auto-accept shares has been disabled
-    And using OCS API version "1"
+    Given using OCS API version "1"
     And these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature
index 0054c77542..7c3b469792 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/accessToShare.feature
@@ -2,8 +2,7 @@
 Feature: sharing
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature
index 3749136b85..2ebb728cd7 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/changingFilesShare.feature
@@ -2,8 +2,7 @@
 Feature: sharing
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature
index f22e74c897..b7efea5833 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingShares.feature
@@ -2,8 +2,7 @@
 Feature: sharing
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature
index d9a6b7283a..9fefc31e79 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesPendingFiltered.feature
@@ -5,8 +5,7 @@ Feature: get the pending shares filtered by type (user, group etc)
   So that I can reduce the amount of data that has to be transferred to be just the data that I need
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature
index 7fe4d6504f..36eee7172d 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFiltered.feature
@@ -5,8 +5,7 @@ Feature: get the received shares filtered by type (user, group etc)
   So that I can reduce the amount of data that has to be transferred to be just the data that I need
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature
index ec0205aaed..2c9533be33 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesReceivedFilteredEmpty.feature
@@ -5,8 +5,7 @@ Feature: get the received shares filtered by type (user, group etc)
   So that I can reduce the amount of data that has to be transferred to be just the data that I need
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature
index af7ba6f9dd..825c702be7 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares1/gettingSharesSharedFiltered.feature
@@ -5,8 +5,7 @@ Feature: get shares filtered by type (user, group etc)
   So that I can reduce the amount of data that has to be transferred to be just the data that I need
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature b/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature
index 0945bb0481..48e7543e0c 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares2/getWebDAVSharePermissions.feature
@@ -2,8 +2,7 @@
 Feature: sharing
 
   Background:
-    Given auto-accept shares has been disabled
-    And using OCS API version "1"
+    Given using OCS API version "1"
     And these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature b/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature
index 07a79e817c..c2752439bd 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares2/shareAccessByID.feature
@@ -2,8 +2,7 @@
 Feature: share access by ID
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature b/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature
index 77bee1d903..277e604c6b 100644
--- a/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature
+++ b/tests/acceptance/features/coreApiShareOperationsToShares2/uploadToShare.feature
@@ -2,8 +2,7 @@
 Feature: sharing
 
   Background:
-    Given auto-accept shares has been disabled
-    And user "Alice" has been created with default attributes and without skeleton files
+    Given user "Alice" has been created with default attributes and without skeleton files
 
 
   Scenario: Uploading file to a user read-only share folder does not work
diff --git a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature
index 1db0dd9651..6cd3e14abd 100644
--- a/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink1/createPublicLinkShareToShares.feature
@@ -2,8 +2,7 @@
 Feature: create a public link share when share_folder is set to Shares
 
   Background:
-    Given auto-accept shares has been disabled
-    And user "Alice" has been created with default attributes and without skeleton files
+    Given user "Alice" has been created with default attributes and without skeleton files
 
 
   Scenario Outline: Creating a new public link share of a file gives the correct response
diff --git a/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature b/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature
index e289c98015..6b9cea35b7 100644
--- a/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature
+++ b/tests/acceptance/features/coreApiSharePublicLink3/updatePublicLinkShare.feature
@@ -249,8 +249,7 @@ Feature: update a public link share
 
 
   Scenario Outline: Adding public upload to a read only shared folder as recipient is not allowed using the public API
-    Given auto-accept shares has been disabled
-    And using OCS API version "<ocs_api_version>"
+    Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/test"
     And user "Alice" has shared folder "/test" with user "Brian" with permissions "share,read"
@@ -273,8 +272,7 @@ Feature: update a public link share
 
 
   Scenario Outline: Adding public upload to a shared folder as recipient is allowed with permissions using the public API
-    Given auto-accept shares has been disabled
-    And using OCS API version "<ocs_api_version>"
+    Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/test"
     And user "Alice" has shared folder "/test" with user "Brian" with permissions "all"
@@ -297,8 +295,7 @@ Feature: update a public link share
 
 
   Scenario Outline: Adding public link with all permissions to a read only shared folder as recipient is not allowed using the public API
-    Given auto-accept shares has been disabled
-    And using OCS API version "<ocs_api_version>"
+    Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/test"
     And user "Alice" has shared folder "/test" with user "Brian" with permissions "share,read"
@@ -321,8 +318,7 @@ Feature: update a public link share
 
 
   Scenario Outline: Adding public link with all permissions to a read only shared folder as recipient is allowed with permissions using the public API
-    Given auto-accept shares has been disabled
-    And using OCS API version "<ocs_api_version>"
+    Given using OCS API version "<ocs_api_version>"
     And user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "/test"
     And user "Alice" has shared folder "/test" with user "Brian" with permissions "all"
diff --git a/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature b/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature
index 9cfc6562cb..502cd48fd7 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares1/reShare.feature
@@ -2,8 +2,7 @@
 Feature: sharing
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature b/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature
index f91afa8a19..8996a8be15 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares2/reShareChain.feature
@@ -2,8 +2,7 @@
 Feature: resharing can be done on a reshared resource
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature b/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature
index 35870cddaf..b47cf45766 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares2/reShareDisabled.feature
@@ -2,8 +2,7 @@
 Feature: resharing can be disabled
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature b/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature
index 2e4dc821c1..d16ed828d1 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares2/reShareSubfolder.feature
@@ -2,8 +2,7 @@
 Feature: a subfolder of a received share can be reshared
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature b/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature
index 9e70ae3c09..1403c24565 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares3/reShareUpdate.feature
@@ -2,8 +2,7 @@
 Feature: sharing
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature b/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature
index fa695e3bcd..d9d9de5c1d 100644
--- a/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature
+++ b/tests/acceptance/features/coreApiShareReshareToShares3/reShareWithExpiryDate.feature
@@ -2,8 +2,7 @@
 Feature: resharing a resource with an expiration date
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature b/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature
index 0a717a1b37..09187687a4 100644
--- a/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature
+++ b/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature
@@ -2,8 +2,7 @@
 Feature: sharing
 
   Background:
-    Given auto-accept shares has been disabled
-    And using OCS API version "1"
+    Given using OCS API version "1"
     And user "Alice" has been created with default attributes and without skeleton files
 
   @smokeTest
diff --git a/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature b/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature
index 9d193353fd..587331332a 100644
--- a/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature
+++ b/tests/acceptance/features/coreApiShareUpdateToShares/updateShareGroupAndUserWithSameName.feature
@@ -2,8 +2,7 @@
 Feature: updating shares to users and groups that have the same name
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature b/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature
index 80170355d8..bf9bb2353e 100644
--- a/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature
+++ b/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature
@@ -2,8 +2,7 @@
 Feature: using trashbin together with sharing
 
   Background:
-    Given auto-accept shares has been disabled
-    And user "Alice" has been created with default attributes and without skeleton files
+    Given user "Alice" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "file to delete" to "/textfile0.txt"
 
   @smokeTest
diff --git a/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature b/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature
index ad3387f996..2b5237a591 100644
--- a/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature
+++ b/tests/acceptance/features/coreApiWebdavLocks2/independentLocksShareToShares.feature
@@ -3,8 +3,7 @@ Feature: independent locks
   Make sure all locks are independent and don't interact with other items that have the same name
 
   Background:
-    Given auto-accept shares has been disabled
-    And user "Alice" has been created with default attributes and without skeleton files
+    Given user "Alice" has been created with default attributes and without skeleton files
     And user "Brian" has been created with default attributes and without skeleton files
 
 
diff --git a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature
index f439cb98e2..49c420e3f9 100644
--- a/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature
+++ b/tests/acceptance/features/coreApiWebdavLocksUnlock/unlockSharingToShares.feature
@@ -2,8 +2,7 @@
 Feature: UNLOCK locked items (sharing)
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiWebdavPreviews/previews.feature b/tests/acceptance/features/coreApiWebdavPreviews/previews.feature
index bab79d8285..9d5293c750 100644
--- a/tests/acceptance/features/coreApiWebdavPreviews/previews.feature
+++ b/tests/acceptance/features/coreApiWebdavPreviews/previews.feature
@@ -79,8 +79,7 @@ Feature: previews of files downloaded through the webdav API
 
 
   Scenario: download previews of shared files (to shares folder)
-    Given auto-accept shares has been disabled
-    And user "Brian" has been created with default attributes and without skeleton files
+    Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt"
     And user "Alice" has shared file "/parent.txt" with user "Brian"
     And user "Brian" has accepted share "/parent.txt" offered by user "Alice"
@@ -122,8 +121,7 @@ Feature: previews of files downloaded through the webdav API
 
   @issue-2538
   Scenario: when owner updates a shared file, previews for sharee are also updated (to shared folder)
-    Given auto-accept shares has been disabled
-    And user "Brian" has been created with default attributes and without skeleton files
+    Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file "filesForUpload/lorem.txt" to "/parent.txt"
     And user "Alice" has shared file "/parent.txt" with user "Brian"
     And user "Brian" has accepted share "/parent.txt" offered by user "Alice"
@@ -143,8 +141,7 @@ Feature: previews of files downloaded through the webdav API
 
 
   Scenario: updates to a file should change the preview for both sharees and sharers
-    Given auto-accept shares has been disabled
-    And user "Brian" has been created with default attributes and without skeleton files
+    Given user "Brian" has been created with default attributes and without skeleton files
     And user "Alice" has created folder "FOLDER"
     And user "Alice" has uploaded file with content "file to upload" to "/FOLDER/lorem.txt"
     And user "Alice" has shared folder "FOLDER" with user "Brian"
@@ -162,8 +159,7 @@ Feature: previews of files downloaded through the webdav API
 
 
   Scenario: updates to a group shared file should change the preview for both sharees and sharers
-    Given auto-accept shares has been disabled
-    And group "grp1" has been created
+    Given group "grp1" has been created
     And 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
     And user "Brian" has been added to group "grp1"
diff --git a/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature b/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature
index c3f3980c8a..d6bda090f5 100644
--- a/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature
+++ b/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature
@@ -6,7 +6,6 @@ Feature: copy file
 
   Background:
     Given using OCS API version "1"
-    And auto-accept shares has been disabled
     And user "Alice" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "ownCloud test text file 0" to "/textfile0.txt"
     And user "Alice" has uploaded file with content "ownCloud test text file 1" to "/textfile1.txt"
diff --git a/tests/acceptance/features/coreApiWebdavProperties1/createFileFolderWhenSharesExist.feature b/tests/acceptance/features/coreApiWebdavProperties1/createFileFolderWhenSharesExist.feature
index 949f42e546..4445d0f5d1 100644
--- a/tests/acceptance/features/coreApiWebdavProperties1/createFileFolderWhenSharesExist.feature
+++ b/tests/acceptance/features/coreApiWebdavProperties1/createFileFolderWhenSharesExist.feature
@@ -5,8 +5,7 @@ Feature: create file or folder named similar to Shares folder
   So that I can organise the files in my file system
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature
index 8704bc16a2..55c587d9bf 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtimeShares.feature
@@ -5,8 +5,7 @@ Feature: upload file
   So that I can find files by their real creation date
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature
index 9e96c8bf10..b6ff91fe70 100644
--- a/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature
+++ b/tests/acceptance/features/coreApiWebdavUploadTUS/uploadToShare.feature
@@ -3,8 +3,7 @@
 Feature: upload file to shared folder
 
   Background:
-    Given auto-accept shares has been disabled
-    And these users have been created with default attributes and without skeleton files:
+    Given these users have been created with default attributes and without skeleton files:
       | username |
       | Alice    |
       | Brian    |
diff --git a/tests/parallelDeployAcceptance/features/apiShareManagement/acceptShares.feature b/tests/parallelDeployAcceptance/features/apiShareManagement/acceptShares.feature
index 70555cc4ee..829a6505de 100644
--- a/tests/parallelDeployAcceptance/features/apiShareManagement/acceptShares.feature
+++ b/tests/parallelDeployAcceptance/features/apiShareManagement/acceptShares.feature
@@ -7,7 +7,6 @@ Feature: sharing files and folders
 
   Background:
     Given using "oc10" as owncloud selector
-    And auto-accept shares has been disabled
     And using OCS API version "1"
     And using new DAV path
     And user "Alice" has been created with default attributes and without skeleton files