diff --git a/tests/acceptance/features/apiSpaces/changingFilesShare.feature b/tests/acceptance/features/apiSpaces/changingFilesShare.feature
index 723125a8ad7..5db689f1a62 100644
--- a/tests/acceptance/features/apiSpaces/changingFilesShare.feature
+++ b/tests/acceptance/features/apiSpaces/changingFilesShare.feature
@@ -9,48 +9,7 @@ Feature:
       | Brian    |
 
 
-  Scenario: Moving files between shares by same user
-    And user "Alice" has created folder "share1"
-    And user "Alice" has created folder "share2"
-    And user "Alice" has uploaded file with content "some data" to "/textfile0.txt"
-    And user "Alice" has moved file "textfile0.txt" to "share1/textfile0.txt"
-    And user "Alice" has shared folder "/share1" with user "Brian"
-    And user "Alice" has shared folder "/share2" with user "Brian"
-    And user "Brian" has accepted share "/share1" offered by user "Alice"
-    And user "Brian" has accepted share "/share2" offered by user "Alice"
-    When user "Brian" moves file "share1/textfile0.txt" to "share2/textfile0.txt" in space "Shares Jail" using the WebDAV API
-    Then the HTTP status code should be "201"
-    And for user "Brian" folder "share1" of the space "Shares Jail" should not contain these entries:
-      | textfile0.txt |
-    And for user "Brian" folder "share2" of the space "Shares Jail" should contain these entries:
-      | textfile0.txt |
-    And for user "Alice" the space "Personal" should not contain these entries:
-      | share1/textfile0.txt |
-    And for user "Alice" the space "Personal" should contain these entries:
-      | share2/textfile0.txt |
-
-  @issue-764
-  Scenario: Moving files added by sharee between shares by same user
-    And user "Alice" has created folder "share1"
-    And user "Alice" has created folder "share2"
-    And user "Brian" has uploaded file with content "some data" to "/textfile0.txt"
-    And user "Alice" has shared folder "/share1" with user "Brian"
-    And user "Alice" has shared folder "/share2" with user "Brian"
-    And user "Brian" has accepted share "/share1" offered by user "Alice"
-    And user "Brian" has accepted share "/share2" offered by user "Alice"
-    When user "Brian" moves file "textfile0.txt" from space "Personal" to "share1/shared_file.txt" inside space "Shares Jail" using the WebDAV API
-    And user "Brian" moves file "share1/shared_file.txt" to "share2/shared_file.txt" in space "Shares Jail" using the WebDAV API
-    Then the HTTP status code of responses on all endpoints should be "201"
-    And for user "Brian" folder "share1" of the space "Shares Jail" should not contain these entries:
-      | shared_file.txt |
-    And for user "Alice" the space "Personal" should contain these entries:
-      | share1/shared_file.txt |
-    And for user "Brian" folder "share2" of the space "Shares Jail" should contain these entries:
-      | shared_file.txt |
-    And for user "Alice" the space "Personal" should contain these entries:
-      | share2/shared_file.txt |
-
-  @issue-764 @issue-4421
+  @issue-4421
   Scenario: Move files between shares by different users
     Given user "Carol" has been created with default attributes and without skeleton files
     And user "Alice" has uploaded file with content "some data" to "/textfile0.txt"
@@ -62,14 +21,11 @@ Feature:
     And user "Carol" has accepted share "/PARENT" offered by user "Alice"
     And user "Carol" has accepted share "/PARENT" offered by user "Brian"
     When user "Carol" moves file "PARENT/shared_file.txt" to "PARENT (1)/shared_file.txt" in space "Shares Jail" using the WebDAV API
-    Then the HTTP status code should be "201"
-    And as "Carol" file "/Shares/PARENT (1)/shared_file.txt" should exist
-    And for user "Brian" folder "PARENT (1)" of the space "Shares Jail" should contain these entries:
+    Then the HTTP status code should be "502"
+    And for user "Carol" folder "PARENT" of the space "Shares Jail" should contain these entries:
+      | shared_file.txt |
+    And for user "Carol" folder "PARENT (1)" of the space "Shares Jail" should not contain these entries:
       | shared_file.txt |
-    And for user "Brian" the space "Personal" should contain these entries:
-      | PARENT/shared_file.txt |
-    And for user "Alice" the space "Personal" should not contain these entries:
-      | PARENT/shared_file.txt |
 
 
   Scenario: overwrite a received file share
diff --git a/tests/acceptance/features/apiSpaces/moveSpaces.feature b/tests/acceptance/features/apiSpaces/moveSpaces.feature
index 6d34fd37fa2..0d743ed0344 100644
--- a/tests/acceptance/features/apiSpaces/moveSpaces.feature
+++ b/tests/acceptance/features/apiSpaces/moveSpaces.feature
@@ -198,6 +198,8 @@ Feature: move (rename) file
     Then the HTTP status code should be "201"
     And for user "Alice" folder "testshare2" of the space "Shares Jail" should contain these entries:
       | testshare1.txt |
+    And for user "Alice" folder "testshare1" of the space "Shares Jail" should not contain these entries:
+      | testshare1.txt |
     And for user "Brian" the space "Personal" should contain these entries:
       | /testshare2/testshare1.txt |