diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
index 08da53942..06ebe61fb 100644
--- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md
+++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md
@@ -58,11 +58,6 @@ Synchronization features like etag propagation, setting mtime and locking files
 
 File and sync features in a shared scenario
 
-#### [file_target of an auto-renamed file is not correct directly after sharing](https://github.com/owncloud/core/issues/32322)
-
-- [coreApiShareManagementToShares/mergeShare.feature:112](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature#L112)
-- [coreApiShareManagementToShares/mergeShare.feature:132](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature#L132)
-
 #### [File deletion using dav gives unique string in filename in the trashbin](https://github.com/owncloud/product/issues/178)
 
 - [coreApiShareManagementBasicToShares/deleteShareFromShares.feature:75](https://github.com/owncloud/ocis/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/deleteShareFromShares.feature#L75)
diff --git a/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature b/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature
index 1e061da49..ad06b065c 100644
--- a/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature
+++ b/tests/acceptance/features/coreApiShareManagementToShares/mergeShare.feature
@@ -116,13 +116,12 @@ Feature: sharing
     And user "Brian" accepts share "/merge-test-outside-groups-renamebeforesecondshare" offered by user "Alice" using the sharing API
     And user "Brian" moves folder "/Shares/merge-test-outside-groups-renamebeforesecondshare" to "/merge-test-outside-groups-renamebeforesecondshare-renamed" using the WebDAV API
     Then the OCS status code of responses on all endpoints should be "100"
-    And the HTTP status code of responses on each endpoint should be "200, 200, 201" respectively
-    And as "Brian" folder "/Shares/merge-test-outside-groups-renamebeforesecondshare" should not exist
-    But as "Brian" folder "/merge-test-outside-groups-renamebeforesecondshare-renamed" should exist
+    And the HTTP status code of responses on each endpoint should be "200, 200, 502" respectively
+    And as "Brian" folder "/Shares/merge-test-outside-groups-renamebeforesecondshare" should exist
+    But as "Brian" folder "/merge-test-outside-groups-renamebeforesecondshare-renamed" should not exist
     # Section 2: Brian receives and accepts the user share from Alice. Brian now has 2 shares of the same folder owned by Alice
     # The server "merges" the 2 shares and presents them to Brian as a single folder inside the "Shares" folder
     When user "Alice" shares folder "/merge-test-outside-groups-renamebeforesecondshare" with user "Brian" using the sharing API
-    And user "Brian" accepts share "/merge-test-outside-groups-renamebeforesecondshare" offered by user "Alice" using the sharing API
     Then the OCS status code of responses on all endpoints should be "100"
     And the HTTP status code of responses on all endpoints should be "200"
     And as "Brian" folder "/Shares/merge-test-outside-groups-renamebeforesecondshare" should exist
@@ -136,9 +135,9 @@ Feature: sharing
     And user "Brian" accepts share "/merge-test-outside-groups-renamebeforesecondshare" offered by user "Alice" using the sharing API
     And user "Brian" moves folder "/Shares/merge-test-outside-groups-renamebeforesecondshare" to "/merge-test-outside-groups-renamebeforesecondshare-renamed" using the WebDAV API
     Then the OCS status code of responses on all endpoints should be "100"
-    And the HTTP status code of responses on each endpoint should be "200, 200, 201" respectively
-    And as "Brian" folder "/Shares/merge-test-outside-groups-renamebeforesecondshare" should not exist
-    But as "Brian" folder "/merge-test-outside-groups-renamebeforesecondshare-renamed" should exist
+    And the HTTP status code of responses on each endpoint should be "200, 200, 502" respectively
+    And as "Brian" folder "/Shares/merge-test-outside-groups-renamebeforesecondshare" should exist
+    But as "Brian" folder "/merge-test-outside-groups-renamebeforesecondshare-renamed" should not exist
     # Section 2: Brian receives and accepts the group share from Alice. Brian now has 2 shares of the same folder owned by Alice
     # The server "merges" the 2 shares and presents them to Brian as a single folder inside the "Shares" folder
     When user "Alice" shares folder "/merge-test-outside-groups-renamebeforesecondshare" with group "grp1" using the sharing API