diff --git a/.drone.yml b/.drone.yml
index 098ce063f1..bff7e7bae5 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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: localAPIAcceptanceTestsOwncloudStorage
     image: owncloudci/php:7.4
@@ -520,7 +520,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: localAPIAcceptanceTestsOcisStorage
     image: owncloudci/php:7.4
@@ -589,7 +589,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: owncloudci/php:7.4
@@ -661,7 +661,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: owncloudci/php:7.4
@@ -733,7 +733,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: owncloudci/php:7.4
@@ -805,7 +805,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: owncloudci/php:7.4
@@ -877,7 +877,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: owncloudci/php:7.4
@@ -949,7 +949,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOcisStorage
     image: owncloudci/php:7.4
@@ -1021,7 +1021,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: owncloudci/php:7.4
@@ -1098,7 +1098,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: owncloudci/php:7.4
@@ -1175,7 +1175,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: owncloudci/php:7.4
@@ -1252,7 +1252,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: owncloudci/php:7.4
@@ -1329,7 +1329,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: owncloudci/php:7.4
@@ -1406,7 +1406,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 773cf3ea127430699f3bfb4c1b24e96a271a8884
+      - git checkout 31105a0d3e6e6ef0a0da2c16c66d4261fd91c069
 
   - name: oC10APIAcceptanceTestsOwncloudStorage
     image: 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 7908998075..3086a6c5b7 100644
--- a/tests/acceptance/expected-failures-on-OCIS-storage.txt
+++ b/tests/acceptance/expected-failures-on-OCIS-storage.txt
@@ -2229,3 +2229,25 @@ apiVersions/fileVersionsSharingToShares.feature:279
 # https://github.com/owncloud/ocis/issues/719 when a share exists its impossible to share a renamed folder
 apiShareManagementBasicToShares/createShareToSharesFolder.feature:611
 apiShareManagementBasicToShares/createShareToSharesFolder.feature:612
+
+# https://github.com/owncloud/ocis/issues/965 ocis-storage does not use the mtime send in the `Upload-Metadata` header when uploading via TUS
+apiWebdavUploadTUS/uploadFileMtime.feature:17
+apiWebdavUploadTUS/uploadFileMtime.feature:18
+apiWebdavUploadTUS/uploadFileMtime.feature:27
+apiWebdavUploadTUS/uploadFileMtime.feature:28
+apiWebdavUploadTUS/uploadFileMtime.feature:38
+apiWebdavUploadTUS/uploadFileMtime.feature:39
+apiWebdavUploadTUS/uploadFileMtime.feature:49
+apiWebdavUploadTUS/uploadFileMtime.feature:50
+apiWebdavUploadTUS/uploadFileMtimeShares.feature:40
+apiWebdavUploadTUS/uploadFileMtimeShares.feature:41
+
+# https://github.com/owncloud/ocis/issues/968 [ocis-storage] PROPFIND on a file uploaded by share receiver is not possible
+apiWebdavUploadTUS/uploadFileMtimeShares.feature:26
+apiWebdavUploadTUS/uploadFileMtimeShares.feature:27
+apiWebdavUploadTUS/uploadFileMtimeShares.feature:55
+apiWebdavUploadTUS/uploadFileMtimeShares.feature:56
+
+# https://github.com/owncloud/ocis/issues/763 [OCIS-storage] reading a file that a collaborator uploaded is impossible
+apiWebdavUploadTUS/uploadFileMtimeShares.feature:70
+apiWebdavUploadTUS/uploadFileMtimeShares.feature:71
diff --git a/tests/oc-integration-tests/drone/storage-oc-ocis.toml b/tests/oc-integration-tests/drone/storage-oc-ocis.toml
index 72c36fa5aa..2813ec74dd 100644
--- a/tests/oc-integration-tests/drone/storage-oc-ocis.toml
+++ b/tests/oc-integration-tests/drone/storage-oc-ocis.toml
@@ -18,7 +18,7 @@ driver = "ocis"
 mount_path = "/oc"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
-data_server_url = "http://localhost:11001/data"
+data_server_url = "http://revad-services:11001/data"
 
 [grpc.services.storageprovider.drivers.ocis]
 root = "/drone/src/tmp/reva/data"
diff --git a/tests/oc-integration-tests/drone/storage-oc-owncloud.toml b/tests/oc-integration-tests/drone/storage-oc-owncloud.toml
index 7fe8d90548..e06dab09fd 100644
--- a/tests/oc-integration-tests/drone/storage-oc-owncloud.toml
+++ b/tests/oc-integration-tests/drone/storage-oc-owncloud.toml
@@ -18,7 +18,7 @@ driver = "owncloud"
 mount_path = "/oc"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
-data_server_url = "http://localhost:11001/data"
+data_server_url = "http://revad-services:11001/data"
 
 [grpc.services.storageprovider.drivers.owncloud]
 datadirectory = "/drone/src/tmp/reva/data"
diff --git a/tests/oc-integration-tests/drone/storage-publiclink-ocis.toml b/tests/oc-integration-tests/drone/storage-publiclink-ocis.toml
index 5d860a7afc..055b7b7ddd 100644
--- a/tests/oc-integration-tests/drone/storage-publiclink-ocis.toml
+++ b/tests/oc-integration-tests/drone/storage-publiclink-ocis.toml
@@ -13,7 +13,7 @@ driver = "ocis"
 mount_path = "/public/"
 mount_id = "e1a73ede-549b-4226-abdf-40e69ca8230d"
 expose_data_server = true
-data_server_url = "http://localhost:13001/data"
+data_server_url = "http://revad-services:13001/data"
 gateway_addr = "0.0.0.0:19000"
 enable_home_creation = true
 
diff --git a/tests/oc-integration-tests/drone/storage-publiclink-owncloud.toml b/tests/oc-integration-tests/drone/storage-publiclink-owncloud.toml
index 5b169d775e..c5472d3e6a 100644
--- a/tests/oc-integration-tests/drone/storage-publiclink-owncloud.toml
+++ b/tests/oc-integration-tests/drone/storage-publiclink-owncloud.toml
@@ -13,7 +13,7 @@ driver = "owncloud"
 mount_path = "/public/"
 mount_id = "e1a73ede-549b-4226-abdf-40e69ca8230d"
 expose_data_server = true
-data_server_url = "http://localhost:13001/data"
+data_server_url = "http://revad-services:13001/data"
 gateway_addr = "0.0.0.0:19000"
 enable_home_creation = true
 
diff --git a/tests/oc-integration-tests/local/storage-home.toml b/tests/oc-integration-tests/local/storage-home.toml
index 0e8cb48559..44502b2b71 100644
--- a/tests/oc-integration-tests/local/storage-home.toml
+++ b/tests/oc-integration-tests/local/storage-home.toml
@@ -26,7 +26,7 @@ driver = "owncloud"
 mount_path = "/home"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
-data_server_url = "http://localhost:12001/data"
+data_server_url = "http://revad-services:12001/data"
 enable_home_creation = true
 
 [grpc.services.storageprovider.drivers.owncloud]
diff --git a/tests/oc-integration-tests/local/storage-oc.toml b/tests/oc-integration-tests/local/storage-oc.toml
index 2fe09a576b..a7d1e3d84d 100644
--- a/tests/oc-integration-tests/local/storage-oc.toml
+++ b/tests/oc-integration-tests/local/storage-oc.toml
@@ -18,7 +18,7 @@ driver = "owncloud"
 mount_path = "/oc"
 mount_id = "123e4567-e89b-12d3-a456-426655440000"
 expose_data_server = true
-data_server_url = "http://localhost:11001/data"
+data_server_url = "http://revad-services:11001/data"
 
 [grpc.services.storageprovider.drivers.owncloud]
 datadirectory = "/var/tmp/reva/data"
diff --git a/tests/oc-integration-tests/local/storage-publiclink.toml b/tests/oc-integration-tests/local/storage-publiclink.toml
index 35e2d6b20c..892c49567a 100644
--- a/tests/oc-integration-tests/local/storage-publiclink.toml
+++ b/tests/oc-integration-tests/local/storage-publiclink.toml
@@ -13,7 +13,7 @@ driver = "owncloud"
 mount_path = "/public/"
 mount_id = "e1a73ede-549b-4226-abdf-40e69ca8230d"
 expose_data_server = true
-data_server_url = "http://localhost:13001/data"
+data_server_url = "http://revad-services:13001/data"
 gateway_addr = "0.0.0.0:19000"
 enable_home_creation = true