diff --git a/.drone.yml b/.drone.yml
index af30a4c9ad..392436c7da 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -446,7 +446,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 914992f5f6d4bb562534fa52273e5bd0bc11b208
+      - git checkout 5711a600adc10b9cbdceae3ee316b22d302bee4f
 
   - name: localAPIAcceptanceTestsOwncloudStorage
     image: owncloudci/php:7.2
@@ -521,7 +521,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 914992f5f6d4bb562534fa52273e5bd0bc11b208
+      - git checkout 5711a600adc10b9cbdceae3ee316b22d302bee4f
 
   - name: localAPIAcceptanceTestsOcisStorage
     image: owncloudci/php:7.2
@@ -597,7 +597,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 914992f5f6d4bb562534fa52273e5bd0bc11b208
+      - git checkout 5711a600adc10b9cbdceae3ee316b22d302bee4f
 
   - name: oC10APIAcceptanceTests
     image: owncloudci/php:7.2
@@ -675,7 +675,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 914992f5f6d4bb562534fa52273e5bd0bc11b208
+      - git checkout 5711a600adc10b9cbdceae3ee316b22d302bee4f
 
   - name: oC10APIAcceptanceTests
     image: owncloudci/php:7.2
@@ -753,7 +753,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 914992f5f6d4bb562534fa52273e5bd0bc11b208
+      - git checkout 5711a600adc10b9cbdceae3ee316b22d302bee4f
 
   - name: oC10APIAcceptanceTests
     image: owncloudci/php:7.2
@@ -831,7 +831,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 914992f5f6d4bb562534fa52273e5bd0bc11b208
+      - git checkout 5711a600adc10b9cbdceae3ee316b22d302bee4f
 
   - name: oC10APIAcceptanceTests
     image: owncloudci/php:7.2
@@ -909,7 +909,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 914992f5f6d4bb562534fa52273e5bd0bc11b208
+      - git checkout 5711a600adc10b9cbdceae3ee316b22d302bee4f
 
   - name: oC10APIAcceptanceTests
     image: owncloudci/php:7.2
@@ -987,7 +987,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 914992f5f6d4bb562534fa52273e5bd0bc11b208
+      - git checkout 5711a600adc10b9cbdceae3ee316b22d302bee4f
 
   - name: oC10APIAcceptanceTests
     image: owncloudci/php:7.2
diff --git a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
index cbeeac3e1b..b5bb50933d 100644
--- a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
+++ b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
@@ -127,12 +127,18 @@ apiFavorites/favorites.feature:148
 apiFavorites/favorites.feature:149
 apiFavorites/favorites.feature:176
 apiFavorites/favorites.feature:177
-apiFavorites/favorites.feature:190
-apiFavorites/favorites.feature:191
-apiFavorites/favorites.feature:204
-apiFavorites/favorites.feature:205
 apiFavorites/favorites.feature:217
 apiFavorites/favorites.feature:218
+apiFavorites/favoritesSharingToShares.feature:22
+apiFavorites/favoritesSharingToShares.feature:23
+apiFavorites/favoritesSharingToShares.feature:36
+apiFavorites/favoritesSharingToShares.feature:37
+apiFavorites/favoritesSharingToShares.feature:49
+apiFavorites/favoritesSharingToShares.feature:50
+apiFavorites/favoritesSharingToShares.feature:63
+apiFavorites/favoritesSharingToShares.feature:64
+apiFavorites/favoritesSharingToShares.feature:77
+apiFavorites/favoritesSharingToShares.feature:78
 #
 # https://github.com/owncloud/ocis-reva/issues/34 groups endpoint does not exist
 #
@@ -457,6 +463,27 @@ apiSharePublicLink2/updatePublicLinkShare.feature:94
 apiSharePublicLink2/updatePublicLinkShare.feature:284
 apiSharePublicLink2/updatePublicLinkShare.feature:285
 #
+# Issues when creating a public link share from a received share
+#
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:25
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:26
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:47
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:48
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:63
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:64
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:78
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:79
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:100
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:101
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:123
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:124
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:140
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:141
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:161
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:162
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:184
+apiSharePublicLink2/reShareAsPublicLinkToShares.feature:185
+#
 # https://github.com/owncloud/ocis-reva/issues/11 listing received shares does not work
 #
 apiSharePublicLink2/updatePublicLinkShare.feature:303
@@ -969,6 +996,10 @@ apiWebdavOperations/refuseAccess.feature:22
 apiWebdavOperations/refuseAccess.feature:33
 apiWebdavOperations/refuseAccess.feature:34
 #
+# https://github.com/owncloud/core/pull/38035 PROPFIND to https://localhost:9200/remote.php/dav/files gets an error 500 response
+#
+apiWebdavOperations/propfind.feature:5
+#
 # https://github.com/owncloud/ocis-reva/issues/39  REPORT request not implemented
 #
 apiWebdavOperations/search.feature:42