diff --git a/3rdparty b/3rdparty
index 8effe5a186aba..3f4e42d064929 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 8effe5a186aba7a912a90a47d2feece97825bb92
+Subproject commit 3f4e42d064929872452c22972274d03f4946ea4e
diff --git a/build/integration/features/bootstrap/FilesDropContext.php b/build/integration/features/bootstrap/FilesDropContext.php
index 4ccb58f08646f..8dd9376f4a67c 100644
--- a/build/integration/features/bootstrap/FilesDropContext.php
+++ b/build/integration/features/bootstrap/FilesDropContext.php
@@ -25,8 +25,8 @@ public function droppingFileWith($path, $content, $nickname = null) {
 			$token = $this->lastShareData->data[0]->token;
 		}
 
-		$base = substr($this->baseUrl, 0, -4);
-		$fullUrl = str_replace('//', '/', $base . "/public.php/dav/files/$token/$path");
+		$base = rtrim(substr($this->baseUrl, 0, -4), '/');
+		$fullUrl = $base . str_replace('//', '/', "/public.php/dav/files/$token/$path");
 
 		$options['headers'] = [
 			'X-REQUESTED-WITH' => 'XMLHttpRequest',
@@ -66,8 +66,8 @@ public function creatingFolderInDrop($folder, $nickname = null) {
 			$token = $this->lastShareData->data[0]->token;
 		}
 
-		$base = substr($this->baseUrl, 0, -4);
-		$fullUrl = str_replace('//', '/', $base . "/public.php/dav/files/$token/$folder");
+		$base = rtrim(substr($this->baseUrl, 0, -4), '/');
+		$fullUrl = $base . str_replace('//', '/', "/public.php/dav/files/$token/$folder");
 
 		$options['headers'] = [
 			'X-REQUESTED-WITH' => 'XMLHttpRequest',
diff --git a/tests/lib/Files/ObjectStore/ObjectStoreTestCase.php b/tests/lib/Files/ObjectStore/ObjectStoreTestCase.php
index 457d9209c995b..fcad984575b25 100644
--- a/tests/lib/Files/ObjectStore/ObjectStoreTestCase.php
+++ b/tests/lib/Files/ObjectStore/ObjectStoreTestCase.php
@@ -83,6 +83,9 @@ public function testDelete(): void {
 		try {
 			set_error_handler(
 				function (int $errno, string $errstr) use (&$warnings): void {
+					if ($errno === E_DEPRECATED || $errno === E_USER_DEPRECATED) {
+						return;
+					}
 					$warnings[] = $errstr;
 				},
 			);
@@ -103,6 +106,9 @@ public function testReadNonExisting(): void {
 		try {
 			set_error_handler(
 				function (int $errno, string $errstr) use (&$warnings): void {
+					if ($errno === E_DEPRECATED || $errno === E_USER_DEPRECATED) {
+						return;
+					}
 					$warnings[] = $errstr;
 				},
 			);
diff --git a/tests/lib/Files/ObjectStore/S3Test.php b/tests/lib/Files/ObjectStore/S3Test.php
index bd0716b65c220..093e9a2c66baa 100644
--- a/tests/lib/Files/ObjectStore/S3Test.php
+++ b/tests/lib/Files/ObjectStore/S3Test.php
@@ -111,6 +111,9 @@ public function testEmptyUpload(): void {
 		$warnings = [];
 		set_error_handler(
 			function (int $errno, string $errstr) use (&$warnings): void {
+				if ($errno === E_DEPRECATED || $errno === E_USER_DEPRECATED) {
+					return;
+				}
 				$warnings[] = $errstr;
 			},
 		);