diff --git a/.drone.yml b/.drone.yml
index 32b3e8e168..122ab5e906 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -488,7 +488,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: localAPIAcceptanceTestsOwncloudStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -562,7 +562,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: localAPIAcceptanceTestsOcisStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -631,7 +631,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -703,7 +703,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -775,7 +775,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -847,7 +847,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -919,7 +919,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -991,7 +991,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -1063,7 +1063,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -1140,7 +1140,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -1217,7 +1217,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -1294,7 +1294,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -1371,7 +1371,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
@@ -1448,7 +1448,7 @@ steps:
       - git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
       - git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
       - cd /drone/src/tmp/testrunner
-      - git checkout 7457f6394958cdb1aee3976edba3181173d64378
+      - git checkout 85da111d5ec5660f7294a789304b4bfc32580d95
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: registry.cern.ch/docker.io/owncloudci/php:7.4
diff --git a/tests/acceptance/expected-failures-on-OCIS-storage.txt b/tests/acceptance/expected-failures-on-OCIS-storage.txt
index ff1fc7577e..78a23b2fa5 100644
--- a/tests/acceptance/expected-failures-on-OCIS-storage.txt
+++ b/tests/acceptance/expected-failures-on-OCIS-storage.txt
@@ -1703,6 +1703,16 @@ apiShareManagementToShares/moveReceivedShare.feature:70
 apiShareManagementToShares/moveReceivedShare.feature:71
 apiShareManagementToShares/moveReceivedShare.feature:73
 apiShareManagementToShares/moveReceivedShare.feature:88
+apiShareManagementToShares/moveReceivedShare.feature:118
+apiShareManagementToShares/moveReceivedShare.feature:128
+apiShareManagementToShares/moveReceivedShare.feature:138
+apiShareManagementToShares/moveReceivedShare.feature:148
+apiShareManagementToShares/moveReceivedShare.feature:158
+apiShareManagementToShares/moveReceivedShare.feature:168
+apiShareManagementToShares/moveReceivedShare.feature:197
+apiShareManagementToShares/moveReceivedShare.feature:198
+apiShareManagementToShares/moveReceivedShare.feature:221
+apiShareManagementToShares/moveReceivedShare.feature:222
 apiShareOperationsToShares/getWebDAVSharePermissions.feature:59
 apiShareOperationsToShares/getWebDAVSharePermissions.feature:60
 apiShareOperationsToShares/getWebDAVSharePermissions.feature:94
diff --git a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
index 3ec928c247..9173ef7b2c 100644
--- a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
+++ b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
@@ -1752,6 +1752,18 @@ apiShareManagementToShares/moveReceivedShare.feature:70
 apiShareManagementToShares/moveReceivedShare.feature:71
 apiShareManagementToShares/moveReceivedShare.feature:73
 apiShareManagementToShares/moveReceivedShare.feature:88
+apiShareManagementToShares/moveReceivedShare.feature:102
+apiShareManagementToShares/moveReceivedShare.feature:110
+apiShareManagementToShares/moveReceivedShare.feature:118
+apiShareManagementToShares/moveReceivedShare.feature:128
+apiShareManagementToShares/moveReceivedShare.feature:138
+apiShareManagementToShares/moveReceivedShare.feature:148
+apiShareManagementToShares/moveReceivedShare.feature:158
+apiShareManagementToShares/moveReceivedShare.feature:168
+apiShareManagementToShares/moveReceivedShare.feature:197
+apiShareManagementToShares/moveReceivedShare.feature:198
+apiShareManagementToShares/moveReceivedShare.feature:221
+apiShareManagementToShares/moveReceivedShare.feature:222
 apiShareOperationsToShares/getWebDAVSharePermissions.feature:59
 apiShareOperationsToShares/getWebDAVSharePermissions.feature:60
 apiShareOperationsToShares/getWebDAVSharePermissions.feature:73
@@ -2198,4 +2210,4 @@ apiShareManagementBasicToShares/createShareToSharesFolder.feature:633
 
 # https://github.com/owncloud/ocis/issues/541 Deletion time in trash bin shows a wrong date
 apiTrashbin/trashbinFilesFolders.feature:284
-apiTrashbin/trashbinFilesFolders.feature:285
\ No newline at end of file
+apiTrashbin/trashbinFilesFolders.feature:285