diff --git a/packages/neon_framework/packages/files_app/lib/src/blocs/browser.dart b/packages/neon_framework/packages/files_app/lib/src/blocs/browser.dart
index 817752bf7b4..e64ae77f660 100644
--- a/packages/neon_framework/packages/files_app/lib/src/blocs/browser.dart
+++ b/packages/neon_framework/packages/files_app/lib/src/blocs/browser.dart
@@ -81,19 +81,19 @@ class _FilesBrowserBloc extends InteractiveBloc implements FilesBrowserBloc {
     await RequestManager.instance.wrap(
       account: account,
       subject: files,
-      getRequest: () => account.client.webdav.propfind_Request(
-        uri,
-        prop: const webdav.WebDavPropWithoutValues.fromBools(
-          davGetcontenttype: true,
-          davGetetag: true,
-          davGetlastmodified: true,
-          ncHasPreview: true,
-          ncMetadataBlurhash: true,
-          ocSize: true,
-          ocFavorite: true,
-        ),
-        depth: webdav.WebDavDepth.one,
-      ),
+      getRequest: () => account.client.webdav(account.username).propfind_Request(
+            uri,
+            prop: const webdav.WebDavPropWithoutValues.fromBools(
+              davGetcontenttype: true,
+              davGetetag: true,
+              davGetlastmodified: true,
+              ncHasPreview: true,
+              ncMetadataBlurhash: true,
+              ocSize: true,
+              ocFavorite: true,
+            ),
+            depth: webdav.WebDavDepth.one,
+          ),
       converter: const webdav.WebDavResponseConverter(),
       unwrap: (response) => BuiltList<webdav.WebDavFile>.build((b) {
         for (final file in response.toWebDavFiles()) {
diff --git a/packages/neon_framework/packages/files_app/lib/src/blocs/files.dart b/packages/neon_framework/packages/files_app/lib/src/blocs/files.dart
index d0c1d54ea4d..00c264ddbc9 100644
--- a/packages/neon_framework/packages/files_app/lib/src/blocs/files.dart
+++ b/packages/neon_framework/packages/files_app/lib/src/blocs/files.dart
@@ -105,7 +105,7 @@ class _FilesBloc extends InteractiveBloc implements FilesBloc {
           file: File(localPath),
         );
         tasks.add(tasks.value.rebuild((b) => b.add(task)));
-        await uploadQueue.add(() => task.execute(account.client));
+        await uploadQueue.add(() => task.execute(account.client.webdav(account.username)));
         tasks.add(tasks.value.rebuild((b) => b.remove(task)));
       },
       disableTimeout: true,
@@ -123,7 +123,7 @@ class _FilesBloc extends InteractiveBloc implements FilesBloc {
           bytes: bytes,
         );
         tasks.add(tasks.value.rebuild((b) => b.add(task)));
-        await uploadQueue.add(() => task.execute(account.client));
+        await uploadQueue.add(() => task.execute(account.client.webdav(account.username)));
         tasks.add(tasks.value.rebuild((b) => b.remove(task)));
       },
       disableTimeout: true,
@@ -166,52 +166,52 @@ class _FilesBloc extends InteractiveBloc implements FilesBloc {
 
   @override
   Future<void> delete(webdav.PathUri uri) async {
-    await wrapAction(() async => account.client.webdav.delete(uri));
+    await wrapAction(() async => account.client.webdav(account.username).delete(uri));
   }
 
   @override
   Future<void> rename(webdav.PathUri uri, String name) async {
     await wrapAction(
-      () async => account.client.webdav.move(
-        uri,
-        uri.rename(name),
-      ),
+      () async => account.client.webdav(account.username).move(
+            uri,
+            uri.rename(name),
+          ),
     );
   }
 
   @override
   Future<void> move(webdav.PathUri uri, webdav.PathUri destination) async {
-    await wrapAction(() async => account.client.webdav.move(uri, destination));
+    await wrapAction(() async => account.client.webdav(account.username).move(uri, destination));
   }
 
   @override
   Future<void> copy(webdav.PathUri uri, webdav.PathUri destination) async {
-    await wrapAction(() async => account.client.webdav.copy(uri, destination));
+    await wrapAction(() async => account.client.webdav(account.username).copy(uri, destination));
   }
 
   @override
   Future<void> addFavorite(webdav.PathUri uri) async {
     await wrapAction(
-      () async => account.client.webdav.proppatch(
-        uri,
-        set: const webdav.WebDavProp(ocFavorite: true),
-      ),
+      () async => account.client.webdav(account.username).proppatch(
+            uri,
+            set: const webdav.WebDavProp(ocFavorite: true),
+          ),
     );
   }
 
   @override
   Future<void> removeFavorite(webdav.PathUri uri) async {
     await wrapAction(
-      () async => account.client.webdav.proppatch(
-        uri,
-        set: const webdav.WebDavProp(ocFavorite: false),
-      ),
+      () async => account.client.webdav(account.username).proppatch(
+            uri,
+            set: const webdav.WebDavProp(ocFavorite: false),
+          ),
     );
   }
 
   @override
   Future<void> createFolder(webdav.PathUri uri) async {
-    await wrapAction(() async => account.client.webdav.mkcol(uri));
+    await wrapAction(() async => account.client.webdav(account.username).mkcol(uri));
   }
 
   Future<File> cacheFile(webdav.PathUri uri, String etag) async {
@@ -236,7 +236,7 @@ class _FilesBloc extends InteractiveBloc implements FilesBloc {
     );
 
     tasks.add(tasks.value.rebuild((b) => b.add(task)));
-    await downloadQueue.add(() => task.execute(account.client));
+    await downloadQueue.add(() => task.execute(account.client.webdav(account.username)));
     tasks.add(tasks.value.rebuild((b) => b.remove(task)));
   }
 
@@ -248,7 +248,7 @@ class _FilesBloc extends InteractiveBloc implements FilesBloc {
     final future = task.stream.forEach(buffer.add);
 
     tasks.add(tasks.value.rebuild((b) => b.add(task)));
-    await downloadQueue.add(() => task.execute(account.client));
+    await downloadQueue.add(() => task.execute(account.client.webdav(account.username)));
     tasks.add(tasks.value.rebuild((b) => b.remove(task)));
 
     await future;
diff --git a/packages/neon_framework/packages/files_app/lib/src/utils/task.dart b/packages/neon_framework/packages/files_app/lib/src/utils/task.dart
index b9b07490d6e..854760529a9 100644
--- a/packages/neon_framework/packages/files_app/lib/src/utils/task.dart
+++ b/packages/neon_framework/packages/files_app/lib/src/utils/task.dart
@@ -2,7 +2,6 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import 'package:meta/meta.dart';
-import 'package:nextcloud/nextcloud.dart';
 import 'package:nextcloud/webdav.dart' as webdav;
 import 'package:timezone/timezone.dart' as tz;
 import 'package:universal_io/io.dart';
@@ -66,8 +65,8 @@ class FilesDownloadTaskIO extends FilesTaskIO implements FilesDownloadTask {
     required super.file,
   });
 
-  Future<void> execute(NextcloudClient client) async {
-    await client.webdav.getFile(
+  Future<void> execute(webdav.WebDavClient client) async {
+    await client.getFile(
       uri,
       file,
       onProgress: progressController.add,
@@ -90,8 +89,8 @@ class FilesUploadTaskIO extends FilesTaskIO implements FilesUploadTask {
   @override
   late tz.TZDateTime lastModified = tz.TZDateTime.from(_stat.modified, tz.UTC);
 
-  Future<void> execute(NextcloudClient client) async {
-    await client.webdav.putFile(
+  Future<void> execute(webdav.WebDavClient client) async {
+    await client.putFile(
       file,
       _stat,
       uri,
@@ -107,8 +106,8 @@ class FilesDownloadTaskMemory extends FilesTaskMemory implements FilesDownloadTa
     required super.uri,
   });
 
-  Future<void> execute(NextcloudClient client) async {
-    final stream = await client.webdav.getStream(
+  Future<void> execute(webdav.WebDavClient client) async {
+    final stream = await client.getStream(
       uri,
       onProgress: progressController.add,
     );
@@ -133,8 +132,8 @@ class FilesUploadTaskMemory extends FilesTaskMemory implements FilesUploadTask {
   @override
   final tz.TZDateTime? lastModified;
 
-  Future<void> execute(NextcloudClient client) async {
-    await client.webdav.putStream(
+  Future<void> execute(webdav.WebDavClient client) async {
+    await client.putStream(
       _stream.stream,
       uri,
       lastModified: lastModified,
diff --git a/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart
index e65d7203879..48b3dd18831 100644
--- a/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart
+++ b/packages/neon_framework/packages/neon_http_client/lib/src/interceptors/csrf_interceptor.dart
@@ -3,7 +3,6 @@ import 'package:interceptor_http_client/interceptor_http_client.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:nextcloud/core.dart' as core;
-import 'package:nextcloud/webdav.dart' as webdav;
 
 /// A HttpInterceptor that works around a Nextcloud CSRF bug when cookies are sent.
 ///
@@ -43,7 +42,7 @@ final class CSRFInterceptor implements HttpInterceptor {
 
   @override
   bool shouldInterceptRequest(http.BaseRequest request) {
-    if (request.url.host != _baseURL.host || !request.url.path.startsWith('${_baseURL.path}${webdav.webdavBase}')) {
+    if (request.url.host != _baseURL.host || !request.url.path.startsWith('${_baseURL.path}/remote.php/')) {
       return false;
     }
 
diff --git a/packages/nextcloud/lib/src/api/webdav/models/webdav_file.dart b/packages/nextcloud/lib/src/api/webdav/models/webdav_file.dart
index 10d4c6ae00d..0ff95ea7ffe 100644
--- a/packages/nextcloud/lib/src/api/webdav/models/webdav_file.dart
+++ b/packages/nextcloud/lib/src/api/webdav/models/webdav_file.dart
@@ -27,7 +27,7 @@ class WebDavFile {
       isAbsolute: false,
       isDirectory: href.isDirectory,
       // The server might be hosted at a subpath, so we don't have a fixed number of path segments to remove
-      pathSegments: href.pathSegments.sublist(href.pathSegments.indexOf('remote.php') + 2),
+      pathSegments: href.pathSegments.sublist(href.pathSegments.indexOf('remote.php') + 4),
     );
   }();
 
diff --git a/packages/nextcloud/lib/src/api/webdav/utils/webdav_uri.dart b/packages/nextcloud/lib/src/api/webdav/utils/webdav_uri.dart
index d9020ec217f..c02fc030ce8 100644
--- a/packages/nextcloud/lib/src/api/webdav/utils/webdav_uri.dart
+++ b/packages/nextcloud/lib/src/api/webdav/utils/webdav_uri.dart
@@ -1,13 +1,10 @@
 import 'package:meta/meta.dart';
 import 'package:nextcloud/src/api/webdav/webdav.dart';
 
-/// Base path used on the server
-final webdavBase = PathUri.parse('/remote.php/webdav');
-
 /// Constructs the uri for a webdav request for a given server [baseURL] and file [path].
 @internal
-Uri constructUri(Uri baseURL, [PathUri? path]) {
-  final segments = baseURL.pathSegments.toList()..addAll(webdavBase.pathSegments);
+Uri constructUri(String username, Uri baseURL, [PathUri? path]) {
+  final segments = baseURL.pathSegments.toList()..addAll(['remote.php', 'dav', 'files', username]);
   if (path != null) {
     segments.addAll(path.pathSegments);
   }
diff --git a/packages/nextcloud/lib/src/api/webdav/webdav_client.dart b/packages/nextcloud/lib/src/api/webdav/webdav_client.dart
index df65f716754..96090710fb4 100644
--- a/packages/nextcloud/lib/src/api/webdav/webdav_client.dart
+++ b/packages/nextcloud/lib/src/api/webdav/webdav_client.dart
@@ -31,6 +31,7 @@ class WebDavClient extends DynamiteClient {
   /// triggered, when cookies are also sent.
   WebDavClient(
     super.baseURL, {
+    required this.username,
     http.Client? httpClient,
     super.authentications,
     bool useCSRFClient = true,
@@ -44,14 +45,22 @@ class WebDavClient extends DynamiteClient {
         );
 
   /// Creates a new [WebDavClient] from another [client].
-  WebDavClient.fromClient(DynamiteClient client)
-      : this(
+  WebDavClient.fromClient(
+    DynamiteClient client, {
+    required String username,
+  }) : this(
           client.baseURL,
+          username: username,
           httpClient: client.httpClient,
           authentications: client.authentications,
         );
 
-  Uri _constructUri([PathUri? path]) => constructUri(baseURL, path);
+  /// The username of the user used for all requests.
+  final String username;
+
+  Uri _constructUri([PathUri? path]) {
+    return constructUri(username, baseURL, path);
+  }
 
   /// Returns a request to query the WebDAV capabilities of the server.
   ///
diff --git a/packages/nextcloud/lib/webdav.dart b/packages/nextcloud/lib/webdav.dart
index e5b7fea5cd2..ed3f704f694 100644
--- a/packages/nextcloud/lib/webdav.dart
+++ b/packages/nextcloud/lib/webdav.dart
@@ -13,8 +13,23 @@ export 'package:nextcloud/src/api/webdav/webdav.dart'
 
 /// Client for WebDAV.
 extension WebDAVExtension on NextcloudClient {
+  static final _username = Expando<String>();
   static final _webdav = Expando<WebDavClient>();
 
   /// Client for WebDAV.
-  WebDavClient get webdav => _webdav[this] ??= WebDavClient.fromClient(this);
+  ///
+  /// To acquire the [username] of the user you can use the provisioning_api.
+  WebDavClient webdav(String username) {
+    if (_username[this] != null && username != _username[this]) {
+      throw ArgumentError(
+        'You can not provide a different username than on the first invocation. Got "$username" but expected "${_username[this]}".',
+      );
+    }
+
+    _username[this] ??= username;
+    return _webdav[this] ??= WebDavClient.fromClient(
+      this,
+      username: username,
+    );
+  }
 }
diff --git a/packages/nextcloud/packages/nextcloud_test/lib/src/models/nextcloud_tester.dart b/packages/nextcloud/packages/nextcloud_test/lib/src/models/nextcloud_tester.dart
index 99e200e8511..f3cbdf7c11e 100644
--- a/packages/nextcloud/packages/nextcloud_test/lib/src/models/nextcloud_tester.dart
+++ b/packages/nextcloud/packages/nextcloud_test/lib/src/models/nextcloud_tester.dart
@@ -12,13 +12,13 @@ final class NextcloudTester {
   NextcloudTester({
     required String appName,
     required Version version,
-    String username = defaultTestUsername,
-  })  : _preset = (name: appName, version: version),
-        _username = username;
+    this.username = defaultTestUsername,
+  }) : _preset = (name: appName, version: version);
 
   final Preset _preset;
 
-  final String _username;
+  /// The username of the configured user.
+  final String username;
 
   /// The app version tested.
   Version get version => _preset.version;
@@ -63,7 +63,7 @@ final class NextcloudTester {
   /// Initializes the tester creating the target and default client.
   Future<void> init() async {
     _target = await TestTargetFactory.instance.spawn(_preset);
-    _client = await _target!.createClient(username: _username);
+    _client = await _target!.createClient(username: username);
   }
 
   /// Closes the tester.
diff --git a/packages/nextcloud/test/api/core/core_test.dart b/packages/nextcloud/test/api/core/core_test.dart
index a3b484c8326..52c703655e1 100644
--- a/packages/nextcloud/test/api/core/core_test.dart
+++ b/packages/nextcloud/test/api/core/core_test.dart
@@ -126,13 +126,13 @@ void main() {
     group('Preview', () {
       setUp(() async {
         final file = File('test/files/test.png');
-        await tester.client.webdav.putFile(file, file.statSync(), webdav.PathUri.parse('preview.png'));
+        await tester.client.webdav(tester.username).putFile(file, file.statSync(), webdav.PathUri.parse('preview.png'));
         resetFixture();
       });
 
       tearDown(() async {
         closeFixture();
-        await tester.client.webdav.delete(webdav.PathUri.parse('preview.png'));
+        await tester.client.webdav(tester.username).delete(webdav.PathUri.parse('preview.png'));
       });
 
       test('Get', () async {
diff --git a/packages/nextcloud/test/api/files_sharing/files_sharing_test.dart b/packages/nextcloud/test/api/files_sharing/files_sharing_test.dart
index 41de132e1c3..fdc036025c3 100644
--- a/packages/nextcloud/test/api/files_sharing/files_sharing_test.dart
+++ b/packages/nextcloud/test/api/files_sharing/files_sharing_test.dart
@@ -11,13 +11,15 @@ void main() {
     group('shareapi', () {
       setUp(() async {
         final file = File('test/files/test.png');
-        await tester.client.webdav.putFile(file, file.statSync(), webdav.PathUri.parse('create-share.png'));
+        await tester.client
+            .webdav(tester.username)
+            .putFile(file, file.statSync(), webdav.PathUri.parse('create-share.png'));
         resetFixture();
       });
 
       tearDown(() async {
         closeFixture();
-        await tester.client.webdav.delete(webdav.PathUri.parse('create-share.png'));
+        await tester.client.webdav(tester.username).delete(webdav.PathUri.parse('create-share.png'));
       });
 
       test('createShare', () async {
diff --git a/packages/nextcloud/test/api/webdav/models/webdav_file_test.dart b/packages/nextcloud/test/api/webdav/models/webdav_file_test.dart
index 9e958acaa41..3876835bdee 100644
--- a/packages/nextcloud/test/api/webdav/models/webdav_file_test.dart
+++ b/packages/nextcloud/test/api/webdav/models/webdav_file_test.dart
@@ -30,7 +30,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/remote.php/webdav/abc/def.txt',
+              href: '/remote.php/dav/files/admin/abc/def.txt',
               propstats: [],
             ),
           ).path,
@@ -42,7 +42,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/remote.php/webdav/abc/def/',
+              href: '/remote.php/dav/files/admin/abc/def/',
               propstats: [],
             ),
           ).path,
@@ -56,7 +56,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/subpath/remote.php/webdav/abc/def.txt',
+              href: '/subpath/remote.php/dav/files/admin/abc/def.txt',
               propstats: [],
             ),
           ).path,
@@ -68,7 +68,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/subpath/remote.php/webdav/abc/def/',
+              href: '/subpath/remote.php/dav/files/admin/abc/def/',
               propstats: [],
             ),
           ).path,
@@ -83,7 +83,7 @@ void main() {
       expect(
         WebDavFile(
           response: const WebDavResponse(
-            href: '/remote.php/webdav/abc/def.txt',
+            href: '/remote.php/dav/files/admin/abc/def.txt',
             propstats: [],
           ),
         ).name,
@@ -95,7 +95,7 @@ void main() {
       expect(
         WebDavFile(
           response: const WebDavResponse(
-            href: '/remote.php/webdav/abc/def/',
+            href: '/remote.php/dav/files/admin/abc/def/',
             propstats: [],
           ),
         ).name,
@@ -110,7 +110,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/remote.php/webdav/abc/def.txt',
+              href: '/remote.php/dav/files/admin/abc/def.txt',
               propstats: [
                 WebDavPropstat(
                   status: 'HTTP/1.1 200 OK',
@@ -129,7 +129,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/remote.php/webdav/abc/def/',
+              href: '/remote.php/dav/files/admin/abc/def/',
               propstats: [
                 WebDavPropstat(
                   status: 'HTTP/1.1 200 OK',
@@ -150,7 +150,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/remote.php/webdav/abc/.def.txt',
+              href: '/remote.php/dav/files/admin/abc/.def.txt',
               propstats: [
                 WebDavPropstat(
                   status: 'HTTP/1.1 200 OK',
@@ -167,7 +167,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/remote.php/webdav/abc/.def/',
+              href: '/remote.php/dav/files/admin/abc/.def/',
               propstats: [
                 WebDavPropstat(
                   status: 'HTTP/1.1 200 OK',
@@ -188,7 +188,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/remote.php/webdav/abc/def.txt',
+              href: '/remote.php/dav/files/admin/abc/def.txt',
               propstats: [
                 WebDavPropstat(
                   status: 'HTTP/1.1 200 OK',
@@ -209,7 +209,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/remote.php/webdav/abc/def/',
+              href: '/remote.php/dav/files/admin/abc/def/',
               propstats: [
                 WebDavPropstat(
                   status: 'HTTP/1.1 200 OK',
@@ -232,7 +232,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/remote.php/webdav/abc/def.txt',
+              href: '/remote.php/dav/files/admin/abc/def.txt',
               propstats: [
                 WebDavPropstat(
                   status: 'HTTP/1.1 200 OK',
@@ -249,7 +249,7 @@ void main() {
         expect(
           WebDavFile(
             response: const WebDavResponse(
-              href: '/remote.php/webdav/abc/def/',
+              href: '/remote.php/dav/files/admin/abc/def/',
               propstats: [
                 WebDavPropstat(
                   status: 'HTTP/1.1 200 OK',
diff --git a/packages/nextcloud/test/api/webdav/utils/webdav_uri_test.dart b/packages/nextcloud/test/api/webdav/utils/webdav_uri_test.dart
index fbe98965cb0..e8243551075 100644
--- a/packages/nextcloud/test/api/webdav/utils/webdav_uri_test.dart
+++ b/packages/nextcloud/test/api/webdav/utils/webdav_uri_test.dart
@@ -11,30 +11,32 @@ void main() {
     ]) {
       final baseURL = Uri.parse(values.$1);
       final sanitizedBaseURL = Uri.parse(values.$2);
+      const username = 'admin';
+      const webdavBase = '/remote.php/dav/files/$username';
 
       test(baseURL, () {
         expect(
-          constructUri(baseURL).toString(),
+          constructUri(username, baseURL).toString(),
           '$sanitizedBaseURL$webdavBase',
         );
         expect(
-          constructUri(baseURL, PathUri.parse('/')).toString(),
+          constructUri(username, baseURL, PathUri.parse('/')).toString(),
           '$sanitizedBaseURL$webdavBase',
         );
         expect(
-          constructUri(baseURL, PathUri.parse('test')).toString(),
+          constructUri(username, baseURL, PathUri.parse('test')).toString(),
           '$sanitizedBaseURL$webdavBase/test',
         );
         expect(
-          constructUri(baseURL, PathUri.parse('test/')).toString(),
+          constructUri(username, baseURL, PathUri.parse('test/')).toString(),
           '$sanitizedBaseURL$webdavBase/test',
         );
         expect(
-          constructUri(baseURL, PathUri.parse('/test')).toString(),
+          constructUri(username, baseURL, PathUri.parse('/test')).toString(),
           '$sanitizedBaseURL$webdavBase/test',
         );
         expect(
-          constructUri(baseURL, PathUri.parse('/test/')).toString(),
+          constructUri(username, baseURL, PathUri.parse('/test/')).toString(),
           '$sanitizedBaseURL$webdavBase/test',
         );
       });
diff --git a/packages/nextcloud/test/api/webdav/webdav_test.dart b/packages/nextcloud/test/api/webdav/webdav_test.dart
index 1e68037e47f..4393c99b8c8 100644
--- a/packages/nextcloud/test/api/webdav/webdav_test.dart
+++ b/packages/nextcloud/test/api/webdav/webdav_test.dart
@@ -64,10 +64,10 @@ void main() {
       final progress = <double>[];
 
       final buffer = BytesBuilder(copy: false);
-      final stream = await client.webdav.getStream(
-        PathUri.cwd(),
-        onProgress: progress.add,
-      );
+      final stream = await client.webdav('admin').getStream(
+            PathUri.cwd(),
+            onProgress: progress.add,
+          );
       await stream.forEach(buffer.add);
 
       expect(buffer.toBytes(), utf8.encode('123'));
@@ -89,6 +89,7 @@ void main() {
 
       client = WebDavClient(
         Uri(),
+        username: 'admin',
         httpClient: mockClient,
       );
 
@@ -125,17 +126,21 @@ void main() {
   });
 
   presets('server', 'webdav', (tester) {
+    late WebDavClient client;
+
     setUpAll(() async {
-      await tester.client.webdav.mkcol(PathUri.parse('test'));
+      client = tester.client.webdav(tester.username);
+
+      await client.mkcol(PathUri.parse('test'));
       resetFixture();
     });
     tearDownAll(() async {
       closeFixture();
-      await tester.client.webdav.delete(PathUri.parse('test'));
+      await client.delete(PathUri.parse('test'));
     });
 
     test('List directory', () async {
-      final responses = (await tester.client.webdav.propfind(
+      final responses = (await client.propfind(
         PathUri.parse('test'),
         prop: const WebDavPropWithoutValues.fromBools(
           ncHasPreview: true,
@@ -149,7 +154,7 @@ void main() {
     });
 
     test('List directory recursively', () async {
-      final responses = (await tester.client.webdav.propfind(
+      final responses = (await client.propfind(
         PathUri.parse('test'),
         depth: WebDavDepth.infinity,
       ))
@@ -159,9 +164,9 @@ void main() {
 
     test('Get file props', () async {
       final file = File('test/files/test.png');
-      await tester.client.webdav.putFile(file, file.statSync(), PathUri.parse('test/test.png'));
+      await client.putFile(file, file.statSync(), PathUri.parse('test/test.png'));
 
-      final result = await tester.client.webdav.propfind(
+      final result = await client.propfind(
         PathUri.parse('test/test.png'),
         prop: const WebDavPropWithoutValues.fromBools(
           davCreationdate: true,
@@ -305,10 +310,10 @@ void main() {
 
     test('Get directory props', () async {
       final data = utf8.encode('test');
-      await tester.client.webdav.mkcol(PathUri.parse('test/dir-props'));
-      await tester.client.webdav.put(data, PathUri.parse('test/dir-props/test.txt'));
+      await client.mkcol(PathUri.parse('test/dir-props'));
+      await client.put(data, PathUri.parse('test/dir-props/test.txt'));
 
-      final response = (await tester.client.webdav.propfind(
+      final response = (await client.propfind(
         PathUri.parse('test/dir-props'),
         prop: const WebDavPropWithoutValues.fromBools(
           davGetcontenttype: true,
@@ -343,7 +348,7 @@ void main() {
 
     test('Create share', () async {
       final file = File('test/files/test.png');
-      await tester.client.webdav.putFile(file, file.statSync(), PathUri.parse('test/share.png'));
+      await client.putFile(file, file.statSync(), PathUri.parse('test/share.png'));
 
       await tester.client.filesSharing.shareapi.createShare(
         $body: files_sharing.ShareapiCreateShareRequestApplicationJson(
@@ -354,7 +359,7 @@ void main() {
         ),
       );
 
-      final response = await tester.client.webdav.propfind(
+      final response = await client.propfind(
         PathUri.parse('test/share.png'),
         prop: const WebDavPropWithoutValues.fromBools(
           ncShareAttributes: true,
@@ -371,16 +376,16 @@ void main() {
     });
 
     test('Filter files', () async {
-      final response = await tester.client.webdav.put(utf8.encode('test'), PathUri.parse('test/filter.txt'));
+      final response = await client.put(utf8.encode('test'), PathUri.parse('test/filter.txt'));
       final id = response.headers['oc-fileid'];
-      await tester.client.webdav.proppatch(
+      await client.proppatch(
         PathUri.parse('test/filter.txt'),
         set: const WebDavProp(
           ocFavorite: true,
         ),
       );
 
-      final responses = (await tester.client.webdav.report(
+      final responses = (await client.report(
         PathUri.parse('test'),
         const WebDavOcFilterRules(
           ocFavorite: true,
@@ -402,14 +407,14 @@ void main() {
       final createdDate = DateTime.utc(1971, 2);
       final uploadTime = DateTime.timestamp();
 
-      await tester.client.webdav.put(
+      await client.put(
         utf8.encode('test'),
         PathUri.parse('test/set-props.txt'),
         lastModified: lastModifiedDate,
         created: createdDate,
       );
 
-      final updated = await tester.client.webdav.proppatch(
+      final updated = await client.proppatch(
         PathUri.parse('test/set-props.txt'),
         set: const WebDavProp(
           ocFavorite: true,
@@ -417,7 +422,7 @@ void main() {
       );
       expect(updated, isTrue);
 
-      final props = (await tester.client.webdav.propfind(
+      final props = (await client.propfind(
         PathUri.parse('test/set-props.txt'),
         prop: const WebDavPropWithoutValues.fromBools(
           ocFavorite: true,
@@ -438,9 +443,9 @@ void main() {
     });
 
     test('Remove properties', () async {
-      await tester.client.webdav.put(utf8.encode('test'), PathUri.parse('test/remove-props.txt'));
+      await client.put(utf8.encode('test'), PathUri.parse('test/remove-props.txt'));
 
-      var updated = await tester.client.webdav.proppatch(
+      var updated = await client.proppatch(
         PathUri.parse('test/remove-props.txt'),
         set: const WebDavProp(
           ocFavorite: true,
@@ -448,7 +453,7 @@ void main() {
       );
       expect(updated, isTrue);
 
-      var props = (await tester.client.webdav.propfind(
+      var props = (await client.propfind(
         PathUri.parse('test/remove-props.txt'),
         prop: const WebDavPropWithoutValues.fromBools(
           ocFavorite: true,
@@ -463,7 +468,7 @@ void main() {
           .prop;
       expect(props.ocFavorite, true);
 
-      updated = await tester.client.webdav.proppatch(
+      updated = await client.proppatch(
         PathUri.parse('test/remove-props.txt'),
         remove: const WebDavPropWithoutValues.fromBools(
           ocFavorite: true,
@@ -471,7 +476,7 @@ void main() {
       );
       expect(updated, isFalse);
 
-      props = (await tester.client.webdav.propfind(
+      props = (await client.propfind(
         PathUri.parse('test/remove-props.txt'),
         prop: const WebDavPropWithoutValues.fromBools(
           ocFavorite: true,
@@ -486,12 +491,12 @@ void main() {
     });
 
     test('Set and get tags', () async {
-      await tester.client.webdav.put(
+      await client.put(
         utf8.encode('test'),
         PathUri.parse('test/tags.txt'),
       );
 
-      final updated = await tester.client.webdav.proppatch(
+      final updated = await client.proppatch(
         PathUri.parse('test/tags.txt'),
         set: const WebDavProp(
           ocTags: WebDavOcTags(tags: ['example']),
@@ -499,7 +504,7 @@ void main() {
       );
       expect(updated, isTrue);
 
-      final response = await tester.client.webdav.propfind(
+      final response = await client.propfind(
         PathUri.parse('test/tags.txt'),
         prop: const WebDavPropWithoutValues.fromBools(
           ocTags: true,
@@ -511,14 +516,14 @@ void main() {
 
     test('Upload file with checksum', () async {
       final file = File('test/files/test.png');
-      await tester.client.webdav.putFile(
+      await client.putFile(
         file,
         file.statSync(),
         PathUri.parse('test/checksum.png'),
         checksum: 'md5:abc',
       );
 
-      final response = await tester.client.webdav.propfind(
+      final response = await client.propfind(
         PathUri.parse('test/checksum.png'),
         prop: const WebDavPropWithoutValues.fromBools(
           ocChecksums: true,
@@ -534,13 +539,13 @@ void main() {
       final source = File('test/files/test.png');
       final progressValues = <double>[];
 
-      await tester.client.webdav.putFile(
+      await client.putFile(
         source,
         source.statSync(),
         PathUri.parse('test/upload_file.png'),
         onProgress: progressValues.add,
       );
-      await tester.client.webdav.getFile(
+      await client.getFile(
         PathUri.parse('test/upload_file.png'),
         destination,
         onProgress: progressValues.add,
@@ -557,13 +562,13 @@ void main() {
       final source = File('test/files/test.png');
       final progressValues = <double>[];
 
-      await tester.client.webdav.putStream(
+      await client.putStream(
         source.openRead(),
         PathUri.parse('test/upload_stream.png'),
         contentLength: source.lengthSync(),
         onProgress: progressValues.add,
       );
-      final stream = await tester.client.webdav.getStream(
+      final stream = await client.getStream(
         PathUri.parse('test/upload_stream.png'),
         onProgress: progressValues.add,
       );
@@ -577,52 +582,52 @@ void main() {
     group('Upload overwrite', () {
       test('Data', () async {
         final data1 = Uint8List.fromList(utf8.encode('123'));
-        await tester.client.webdav.put(
+        await client.put(
           data1,
           PathUri.parse('test/upload_overwrite.png'),
         );
-        var response = await tester.client.webdav.get(PathUri.parse('test/upload_overwrite.png'));
+        var response = await client.get(PathUri.parse('test/upload_overwrite.png'));
         expect(response, data1);
 
         final data2 = Uint8List.fromList(utf8.encode('456'));
-        await tester.client.webdav.put(
+        await client.put(
           data2,
           PathUri.parse('test/upload_overwrite.png'),
         );
-        response = await tester.client.webdav.get(PathUri.parse('test/upload_overwrite.png'));
+        response = await client.get(PathUri.parse('test/upload_overwrite.png'));
         expect(response, data2);
       });
 
       test('Stream', () async {
         final data1 = Uint8List.fromList(utf8.encode('123'));
-        await tester.client.webdav.putStream(
+        await client.putStream(
           Stream.value(data1),
           PathUri.parse('test/upload_overwrite.png'),
           contentLength: data1.length,
         );
-        var response = await tester.client.webdav.get(PathUri.parse('test/upload_overwrite.png'));
+        var response = await client.get(PathUri.parse('test/upload_overwrite.png'));
         expect(response, data1);
 
         final data2 = Uint8List.fromList(utf8.encode('456'));
-        await tester.client.webdav.putStream(
+        await client.putStream(
           Stream.value(data2),
           PathUri.parse('test/upload_overwrite.png'),
           contentLength: data2.length,
         );
-        response = await tester.client.webdav.get(PathUri.parse('test/upload_overwrite.png'));
+        response = await client.get(PathUri.parse('test/upload_overwrite.png'));
         expect(response, data2);
       });
     });
 
     test('getStream error handling', () async {
       await expectLater(
-        () => tester.client.webdav.getStream(PathUri.parse('test/404.txt')),
+        () => client.getStream(PathUri.parse('test/404.txt')),
         throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 404)),
       );
     });
 
     test('Extended mkcol', () async {
-      await tester.client.webdav.mkcol(
+      await client.mkcol(
         PathUri.parse('test/extended-mkcol'),
         set: const WebDavProp(
           davResourcetype: WebDavResourcetype(collection: [null]),
@@ -630,7 +635,7 @@ void main() {
         ),
       );
 
-      final propfindResponse = await tester.client.webdav.propfind(
+      final propfindResponse = await client.propfind(
         PathUri.parse('test/extended-mkcol'),
         prop: const WebDavPropWithoutValues.fromBools(
           ocTags: true,
@@ -643,7 +648,7 @@ void main() {
     group('litmus', () {
       group('basic', () {
         test('options', () async {
-          final options = await tester.client.webdav.options();
+          final options = await client.options();
           expect(options.capabilities, contains('1'));
           expect(options.capabilities, contains('3'));
           // Nextcloud only contains a fake plugin for Class 2 support: https://github.com/nextcloud/server/blob/master/apps/dav/lib/Connector/Sabre/FakeLockerPlugin.php
@@ -658,30 +663,30 @@ void main() {
           test(name, () async {
             final content = utf8.encode('This is a test file');
 
-            await tester.client.webdav.put(content, PathUri.parse('test/$path'));
+            await client.put(content, PathUri.parse('test/$path'));
 
-            final downloadedContent = await tester.client.webdav.get(PathUri.parse('test/$path'));
+            final downloadedContent = await client.get(PathUri.parse('test/$path'));
             expect(downloadedContent, equals(content));
           });
         }
 
         test('put_no_parent', () async {
           await expectLater(
-            () => tester.client.webdav.put(Uint8List(0), PathUri.parse('test/409me/noparent.txt')),
+            () => client.put(Uint8List(0), PathUri.parse('test/409me/noparent.txt')),
             // https://github.com/nextcloud/server/issues/39625
-            throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 409)),
+            throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 404)),
           );
         });
 
         test('delete', () async {
-          await tester.client.webdav.put(Uint8List(0), PathUri.parse('test/delete.txt'));
+          await client.put(Uint8List(0), PathUri.parse('test/delete.txt'));
 
-          await tester.client.webdav.delete(PathUri.parse('test/delete.txt'));
+          await client.delete(PathUri.parse('test/delete.txt'));
         });
 
         test('delete_null', () async {
           await expectLater(
-            () => tester.client.webdav.delete(PathUri.parse('test/delete-null.txt')),
+            () => client.delete(PathUri.parse('test/delete-null.txt')),
             throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 404)),
           );
         });
@@ -689,27 +694,27 @@ void main() {
         // delete_fragment: This test is not applicable because the fragment is already removed on the client side
 
         test('mkcol', () async {
-          await tester.client.webdav.mkcol(PathUri.parse('test/mkcol'));
+          await client.mkcol(PathUri.parse('test/mkcol'));
         });
 
         test('mkcol_again', () async {
-          await tester.client.webdav.mkcol(PathUri.parse('test/mkcol-again'));
+          await client.mkcol(PathUri.parse('test/mkcol-again'));
 
           await expectLater(
-            () => tester.client.webdav.mkcol(PathUri.parse('test/mkcol-again')),
+            () => client.mkcol(PathUri.parse('test/mkcol-again')),
             throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 405)),
           );
         });
 
         test('delete_coll', () async {
-          await tester.client.webdav.mkcol(PathUri.parse('test/delete-coll'));
+          await client.mkcol(PathUri.parse('test/delete-coll'));
 
-          await tester.client.webdav.delete(PathUri.parse('test/delete-coll'));
+          await client.delete(PathUri.parse('test/delete-coll'));
         });
 
         test('mkcol_no_parent', () async {
           await expectLater(
-            () => tester.client.webdav.mkcol(PathUri.parse('test/409me/noparent')),
+            () => client.mkcol(PathUri.parse('test/409me/noparent')),
             throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 409)),
           );
         });
@@ -719,22 +724,21 @@ void main() {
 
       group('copymove', () {
         test('copy_simple', () async {
-          await tester.client.webdav.mkcol(PathUri.parse('test/copy-simple-src'));
+          await client.mkcol(PathUri.parse('test/copy-simple-src'));
 
-          await tester.client.webdav.copy(PathUri.parse('test/copy-simple-src'), PathUri.parse('test/copy-simple-dst'));
+          await client.copy(PathUri.parse('test/copy-simple-src'), PathUri.parse('test/copy-simple-dst'));
         });
 
         test('copy_overwrite', () async {
-          await tester.client.webdav.mkcol(PathUri.parse('test/copy-overwrite-src'));
-          await tester.client.webdav.mkcol(PathUri.parse('test/copy-overwrite-dst'));
+          await client.mkcol(PathUri.parse('test/copy-overwrite-src'));
+          await client.mkcol(PathUri.parse('test/copy-overwrite-dst'));
 
           await expectLater(
-            () => tester.client.webdav
-                .copy(PathUri.parse('test/copy-overwrite-src'), PathUri.parse('test/copy-overwrite-dst')),
+            () => client.copy(PathUri.parse('test/copy-overwrite-src'), PathUri.parse('test/copy-overwrite-dst')),
             throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 412)),
           );
 
-          await tester.client.webdav.copy(
+          await client.copy(
             PathUri.parse('test/copy-overwrite-src'),
             PathUri.parse('test/copy-overwrite-dst'),
             overwrite: true,
@@ -742,59 +746,58 @@ void main() {
         });
 
         test('copy_nodestcoll', () async {
-          await tester.client.webdav.mkcol(PathUri.parse('test/copy-nodestcoll-src'));
+          await client.mkcol(PathUri.parse('test/copy-nodestcoll-src'));
 
           await expectLater(
-            () => tester.client.webdav
-                .copy(PathUri.parse('test/copy-nodestcoll-src'), PathUri.parse('test/nonesuch/dst')),
+            () => client.copy(PathUri.parse('test/copy-nodestcoll-src'), PathUri.parse('test/nonesuch/dst')),
             throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 409)),
           );
         });
 
         test('copy_coll', () async {
-          await tester.client.webdav.mkcol(PathUri.parse('test/copy-coll-src'));
-          await tester.client.webdav.mkcol(PathUri.parse('test/copy-coll-src/sub'));
+          await client.mkcol(PathUri.parse('test/copy-coll-src'));
+          await client.mkcol(PathUri.parse('test/copy-coll-src/sub'));
           for (var i = 0; i < 10; i++) {
-            await tester.client.webdav.put(Uint8List(0), PathUri.parse('test/copy-coll-src/$i.txt'));
+            await client.put(Uint8List(0), PathUri.parse('test/copy-coll-src/$i.txt'));
           }
-          await tester.client.webdav.copy(PathUri.parse('test/copy-coll-src'), PathUri.parse('test/copy-coll-dst1'));
-          await tester.client.webdav.copy(PathUri.parse('test/copy-coll-src'), PathUri.parse('test/copy-coll-dst2'));
+          await client.copy(PathUri.parse('test/copy-coll-src'), PathUri.parse('test/copy-coll-dst1'));
+          await client.copy(PathUri.parse('test/copy-coll-src'), PathUri.parse('test/copy-coll-dst2'));
 
           await expectLater(
-            () => tester.client.webdav.copy(PathUri.parse('test/copy-coll-src'), PathUri.parse('test/copy-coll-dst1')),
+            () => client.copy(PathUri.parse('test/copy-coll-src'), PathUri.parse('test/copy-coll-dst1')),
             throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 412)),
           );
 
-          await tester.client.webdav.copy(
+          await client.copy(
             PathUri.parse('test/copy-coll-src'),
             PathUri.parse('test/copy-coll-dst2'),
             overwrite: true,
           );
 
           for (var i = 0; i < 10; i++) {
-            await tester.client.webdav.delete(PathUri.parse('test/copy-coll-dst1/$i.txt'));
+            await client.delete(PathUri.parse('test/copy-coll-dst1/$i.txt'));
           }
 
-          await tester.client.webdav.delete(PathUri.parse('test/copy-coll-dst1/sub'));
+          await client.delete(PathUri.parse('test/copy-coll-dst1/sub'));
 
-          await tester.client.webdav.delete(PathUri.parse('test/copy-coll-dst2'));
+          await client.delete(PathUri.parse('test/copy-coll-dst2'));
         });
 
         // copy_shallow: Does not work on litmus, let's wait for https://github.com/nextcloud/server/issues/39627
 
         test('move', () async {
-          await tester.client.webdav.put(Uint8List(0), PathUri.parse('test/move-src1.txt'));
-          await tester.client.webdav.put(Uint8List(0), PathUri.parse('test/move-src2.txt'));
-          await tester.client.webdav.mkcol(PathUri.parse('test/move-coll'));
+          await client.put(Uint8List(0), PathUri.parse('test/move-src1.txt'));
+          await client.put(Uint8List(0), PathUri.parse('test/move-src2.txt'));
+          await client.mkcol(PathUri.parse('test/move-coll'));
 
-          await tester.client.webdav.move(PathUri.parse('test/move-src1.txt'), PathUri.parse('test/move-dst.txt'));
+          await client.move(PathUri.parse('test/move-src1.txt'), PathUri.parse('test/move-dst.txt'));
 
           await expectLater(
-            () => tester.client.webdav.move(PathUri.parse('test/move-src2.txt'), PathUri.parse('test/move-dst.txt')),
+            () => client.move(PathUri.parse('test/move-src2.txt'), PathUri.parse('test/move-dst.txt')),
             throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 412)),
           );
 
-          await tester.client.webdav.move(
+          await client.move(
             PathUri.parse('test/move-src2.txt'),
             PathUri.parse('test/move-dst.txt'),
             overwrite: true,
@@ -802,33 +805,35 @@ void main() {
         });
 
         test('move_coll', () async {
-          await tester.client.webdav.mkcol(PathUri.parse('test/move-coll-src'));
-          await tester.client.webdav.mkcol(PathUri.parse('test/move-coll-src/sub'));
+          await client.mkcol(PathUri.parse('test/move-coll-src'));
+          await client.mkcol(PathUri.parse('test/move-coll-src/sub'));
           for (var i = 0; i < 10; i++) {
-            await tester.client.webdav.put(Uint8List(0), PathUri.parse('test/move-coll-src/$i.txt'));
+            await client.put(Uint8List(0), PathUri.parse('test/move-coll-src/$i.txt'));
           }
-          await tester.client.webdav.put(Uint8List(0), PathUri.parse('test/move-coll-noncoll'));
-          await tester.client.webdav.copy(PathUri.parse('test/move-coll-src'), PathUri.parse('test/move-coll-dst2'));
-          await tester.client.webdav.move(PathUri.parse('test/move-coll-src'), PathUri.parse('test/move-coll-dst1'));
+          await client.put(Uint8List(0), PathUri.parse('test/move-coll-noncoll'));
+          await client.copy(PathUri.parse('test/move-coll-src'), PathUri.parse('test/move-coll-dst2'));
+          await client.move(PathUri.parse('test/move-coll-src'), PathUri.parse('test/move-coll-dst1'));
 
           await expectLater(
-            () => tester.client.webdav.move(PathUri.parse('test/move-coll-dst1'), PathUri.parse('test/move-coll-dst2')),
+            () => client.move(PathUri.parse('test/move-coll-dst1'), PathUri.parse('test/move-coll-dst2')),
             throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 412)),
           );
 
-          await tester.client.webdav
-              .move(PathUri.parse('test/move-coll-dst2'), PathUri.parse('test/move-coll-dst1'), overwrite: true);
-          await tester.client.webdav.copy(PathUri.parse('test/move-coll-dst1'), PathUri.parse('test/move-coll-dst2'));
+          await client.move(
+            PathUri.parse('test/move-coll-dst2'),
+            PathUri.parse('test/move-coll-dst1'),
+            overwrite: true,
+          );
+          await client.copy(PathUri.parse('test/move-coll-dst1'), PathUri.parse('test/move-coll-dst2'));
 
           for (var i = 0; i < 10; i++) {
-            await tester.client.webdav.delete(PathUri.parse('test/move-coll-dst1/$i.txt'));
+            await client.delete(PathUri.parse('test/move-coll-dst1/$i.txt'));
           }
 
-          await tester.client.webdav.delete(PathUri.parse('test/move-coll-dst1/sub'));
+          await client.delete(PathUri.parse('test/move-coll-dst1/sub'));
 
           await expectLater(
-            () => tester.client.webdav
-                .move(PathUri.parse('test/move-coll-dst2'), PathUri.parse('test/move-coll-noncoll')),
+            () => client.move(PathUri.parse('test/move-coll-dst2'), PathUri.parse('test/move-coll-noncoll')),
             throwsA(predicate<DynamiteStatusCodeException>((e) => e.statusCode == 412)),
           );
         });
@@ -840,9 +845,9 @@ void main() {
         // large_put: Already covered by large_get
 
         test('large_get', () async {
-          await tester.client.webdav.put(Uint8List(largefileSize), PathUri.parse('test/largefile.txt'));
+          await client.put(Uint8List(largefileSize), PathUri.parse('test/largefile.txt'));
 
-          final downloadedContent = await tester.client.webdav.get(PathUri.parse('test/largefile.txt'));
+          final downloadedContent = await client.get(PathUri.parse('test/largefile.txt'));
           expect(downloadedContent, hasLength(largefileSize));
         });
       });
@@ -857,12 +862,12 @@ void main() {
       final destination = File('${destinationDir.path}/empty-file');
       final source = File('${destinationDir.path}/empty-file-source')..createSync();
 
-      await tester.client.webdav.putFile(
+      await client.putFile(
         source,
         source.statSync(),
         PathUri.parse('test/empty-file'),
       );
-      await tester.client.webdav.getFile(
+      await client.getFile(
         PathUri.parse('test/empty-file'),
         destination,
         onProgress: callback.progressCallback,
diff --git a/packages/nextcloud/test/fixtures/webdav/create_share.regexp b/packages/nextcloud/test/fixtures/webdav/create_share.regexp
index 40852135249..3d692e18624 100644
--- a/packages/nextcloud/test/fixtures/webdav/create_share.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/create_share.regexp
@@ -1,4 +1,4 @@
-PUT http://localhost/remote\.php/webdav/test/share\.png
+PUT http://localhost/remote\.php/dav/files/user1/test/share\.png
 authorization: Bearer mock
 content-length: 8650
 content-type: application/xml
@@ -11,7 +11,7 @@ authorization: Bearer mock
 content-type: application/json; charset=utf-8
 ocs-apirequest: true
 \{"shareType":0,"publicUpload":"false","password":"","note":"","label":"","path":"/test/share\.png","shareWith":"user2"\}
-PROPFIND http://localhost/remote\.php/webdav/test/share\.png
+PROPFIND http://localhost/remote\.php/dav/files/user1/test/share\.png
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/extended_mkcol.regexp b/packages/nextcloud/test/fixtures/webdav/extended_mkcol.regexp
index 3c86e73bdd5..b3d97bd11dc 100644
--- a/packages/nextcloud/test/fixtures/webdav/extended_mkcol.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/extended_mkcol.regexp
@@ -1,10 +1,10 @@
-MKCOL http://localhost/remote\.php/webdav/test/extended-mkcol
+MKCOL http://localhost/remote\.php/dav/files/user1/test/extended-mkcol
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 <d:mkcol xmlns:d="DAV:" xmlns:oc="http://owncloud\.org/ns" xmlns:nc="http://nextcloud\.org/ns" xmlns:ocs="http://open-collaboration-services\.org/ns" xmlns:ocm="http://open-cloud-mesh\.org/ns"><d:set><d:prop><d:resourcetype><d:collection/></d:resourcetype><oc:tags><oc:tag>extended</oc:tag></oc:tags></d:prop></d:set></d:mkcol>
-PROPFIND http://localhost/remote\.php/webdav/test/extended-mkcol
+PROPFIND http://localhost/remote\.php/dav/files/user1/test/extended-mkcol
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/filter_files.regexp b/packages/nextcloud/test/fixtures/webdav/filter_files.regexp
index ab74eec6af6..f6ee5974083 100644
--- a/packages/nextcloud/test/fixtures/webdav/filter_files.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/filter_files.regexp
@@ -1,17 +1,17 @@
-PUT http://localhost/remote\.php/webdav/test/filter\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/filter\.txt
 authorization: Bearer mock
 content-length: 4
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 test
-PROPPATCH http://localhost/remote\.php/webdav/test/filter\.txt
+PROPPATCH http://localhost/remote\.php/dav/files/user1/test/filter\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 <d:propertyupdate xmlns:d="DAV:" xmlns:oc="http://owncloud\.org/ns" xmlns:nc="http://nextcloud\.org/ns" xmlns:ocs="http://open-collaboration-services\.org/ns" xmlns:ocm="http://open-cloud-mesh\.org/ns"><d:set><d:prop><oc:favorite>true</oc:favorite></d:prop></d:set></d:propertyupdate>
-REPORT http://localhost/remote\.php/webdav/test
+REPORT http://localhost/remote\.php/dav/files/user1/test
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/get_directory_props.regexp b/packages/nextcloud/test/fixtures/webdav/get_directory_props.regexp
index bc197768fe7..ce942d39093 100644
--- a/packages/nextcloud/test/fixtures/webdav/get_directory_props.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/get_directory_props.regexp
@@ -1,16 +1,16 @@
-MKCOL http://localhost/remote\.php/webdav/test/dir-props
+MKCOL http://localhost/remote\.php/dav/files/user1/test/dir-props
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/dir-props/test\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/dir-props/test\.txt
 authorization: Bearer mock
 content-length: 4
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 test
-PROPFIND http://localhost/remote\.php/webdav/test/dir-props
+PROPFIND http://localhost/remote\.php/dav/files/user1/test/dir-props
 authorization: Bearer mock
 content-type: application/xml
 depth: 0
diff --git a/packages/nextcloud/test/fixtures/webdav/get_file_props.regexp b/packages/nextcloud/test/fixtures/webdav/get_file_props.regexp
index 05624aa6512..de7ad3849a6 100644
--- a/packages/nextcloud/test/fixtures/webdav/get_file_props.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/get_file_props.regexp
@@ -1,11 +1,11 @@
-PUT http://localhost/remote\.php/webdav/test/test\.png
+PUT http://localhost/remote\.php/dav/files/user1/test/test\.png
 authorization: Bearer mock
 content-length: 8650
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 .+
-PROPFIND http://localhost/remote\.php/webdav/test/test\.png
+PROPFIND http://localhost/remote\.php/dav/files/user1/test/test\.png
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/getstream_error_handling.regexp b/packages/nextcloud/test/fixtures/webdav/getstream_error_handling.regexp
index d846a27b7e2..30fafa348ac 100644
--- a/packages/nextcloud/test/fixtures/webdav/getstream_error_handling.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/getstream_error_handling.regexp
@@ -1,4 +1,4 @@
-GET http://localhost/remote\.php/webdav/test/404\.txt
+GET http://localhost/remote\.php/dav/files/user1/test/404\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/list_directory.regexp b/packages/nextcloud/test/fixtures/webdav/list_directory.regexp
index b57d3b33b78..5733b296db5 100644
--- a/packages/nextcloud/test/fixtures/webdav/list_directory.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/list_directory.regexp
@@ -1,4 +1,4 @@
-PROPFIND http://localhost/remote\.php/webdav/test
+PROPFIND http://localhost/remote\.php/dav/files/user1/test
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/list_directory_recursively.regexp b/packages/nextcloud/test/fixtures/webdav/list_directory_recursively.regexp
index 5d1db10744d..eeab71eb2aa 100644
--- a/packages/nextcloud/test/fixtures/webdav/list_directory_recursively.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/list_directory_recursively.regexp
@@ -1,4 +1,4 @@
-PROPFIND http://localhost/remote\.php/webdav/test
+PROPFIND http://localhost/remote\.php/dav/files/user1/test
 authorization: Bearer mock
 content-type: application/xml
 depth: infinity
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete.regexp
index 133364c6cc2..eb9551e80f4 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete.regexp
@@ -1,10 +1,10 @@
-PUT http://localhost/remote\.php/webdav/test/delete\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/delete\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/delete\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/delete\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete_coll.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete_coll.regexp
index fd7783afa98..bc670fa635a 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete_coll.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete_coll.regexp
@@ -1,9 +1,9 @@
-MKCOL http://localhost/remote\.php/webdav/test/delete-coll
+MKCOL http://localhost/remote\.php/dav/files/user1/test/delete-coll
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/delete-coll
+DELETE http://localhost/remote\.php/dav/files/user1/test/delete-coll
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete_null.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete_null.regexp
index c46668f33f3..961eee5e01f 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete_null.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/basic/delete_null.regexp
@@ -1,4 +1,4 @@
-DELETE http://localhost/remote\.php/webdav/test/delete-null\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/delete-null\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol.regexp
index 77d13be9af1..565ac5aed61 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol.regexp
@@ -1,4 +1,4 @@
-MKCOL http://localhost/remote\.php/webdav/test/mkcol
+MKCOL http://localhost/remote\.php/dav/files/user1/test/mkcol
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol_again.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol_again.regexp
index 42d76f8cc82..ebb983ab8e8 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol_again.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol_again.regexp
@@ -1,9 +1,9 @@
-MKCOL http://localhost/remote\.php/webdav/test/mkcol-again
+MKCOL http://localhost/remote\.php/dav/files/user1/test/mkcol-again
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-MKCOL http://localhost/remote\.php/webdav/test/mkcol-again
+MKCOL http://localhost/remote\.php/dav/files/user1/test/mkcol-again
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol_no_parent.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol_no_parent.regexp
index a36f60345c6..72560da9530 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol_no_parent.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/basic/mkcol_no_parent.regexp
@@ -1,4 +1,4 @@
-MKCOL http://localhost/remote\.php/webdav/test/409me/noparent
+MKCOL http://localhost/remote\.php/dav/files/user1/test/409me/noparent
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/basic/options.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/basic/options.regexp
index 46f2b3ab38d..79a97972896 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/basic/options.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/basic/options.regexp
@@ -1,4 +1,4 @@
-OPTIONS http://localhost/remote\.php/webdav
+OPTIONS http://localhost/remote\.php/dav/files/user1
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_get.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_get.regexp
index 0cc133c124d..80cf4d838f6 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_get.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_get.regexp
@@ -1,11 +1,11 @@
-PUT http://localhost/remote\.php/webdav/test/res
+PUT http://localhost/remote\.php/dav/files/user1/test/res
 authorization: Bearer mock
 content-length: 19
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 This is a test file
-GET http://localhost/remote\.php/webdav/test/res
+GET http://localhost/remote\.php/dav/files/user1/test/res
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_get_utf8_segment.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_get_utf8_segment.regexp
index 5cd0c8f8a48..b4f3275ee55 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_get_utf8_segment.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_get_utf8_segment.regexp
@@ -1,11 +1,11 @@
-PUT http://localhost/remote\.php/webdav/test/res-%25e2%2582%25ac
+PUT http://localhost/remote\.php/dav/files/user1/test/res-%25e2%2582%25ac
 authorization: Bearer mock
 content-length: 19
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 This is a test file
-GET http://localhost/remote\.php/webdav/test/res-%25e2%2582%25ac
+GET http://localhost/remote\.php/dav/files/user1/test/res-%25e2%2582%25ac
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_no_parent.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_no_parent.regexp
index 206f9fd4873..eb4a1368ad2 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_no_parent.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/basic/put_no_parent.regexp
@@ -1,4 +1,4 @@
-PUT http://localhost/remote\.php/webdav/test/409me/noparent\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/409me/noparent\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_coll.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_coll.regexp
index 575f72a9a8f..160affaa59a 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_coll.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_coll.regexp
@@ -1,157 +1,157 @@
-MKCOL http://localhost/remote\.php/webdav/test/copy-coll-src
+MKCOL http://localhost/remote\.php/dav/files/user1/test/copy-coll-src
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-MKCOL http://localhost/remote\.php/webdav/test/copy-coll-src/sub
+MKCOL http://localhost/remote\.php/dav/files/user1/test/copy-coll-src/sub
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/copy-coll-src/0\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/copy-coll-src/0\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/copy-coll-src/1\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/copy-coll-src/1\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/copy-coll-src/2\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/copy-coll-src/2\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/copy-coll-src/3\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/copy-coll-src/3\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/copy-coll-src/4\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/copy-coll-src/4\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/copy-coll-src/5\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/copy-coll-src/5\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/copy-coll-src/6\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/copy-coll-src/6\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/copy-coll-src/7\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/copy-coll-src/7\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/copy-coll-src/8\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/copy-coll-src/8\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/copy-coll-src/9\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/copy-coll-src/9\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-COPY http://localhost/remote\.php/webdav/test/copy-coll-src
+COPY http://localhost/remote\.php/dav/files/user1/test/copy-coll-src
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/copy-coll-dst1
+destination: http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
-COPY http://localhost/remote\.php/webdav/test/copy-coll-src
+COPY http://localhost/remote\.php/dav/files/user1/test/copy-coll-src
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/copy-coll-dst2
+destination: http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst2
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
-COPY http://localhost/remote\.php/webdav/test/copy-coll-src
+COPY http://localhost/remote\.php/dav/files/user1/test/copy-coll-src
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/copy-coll-dst1
+destination: http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
-COPY http://localhost/remote\.php/webdav/test/copy-coll-src
+COPY http://localhost/remote\.php/dav/files/user1/test/copy-coll-src
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/copy-coll-dst2
+destination: http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst2
 ocs-apirequest: true
 overwrite: T
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst1/0\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1/0\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst1/1\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1/1\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst1/2\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1/2\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst1/3\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1/3\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst1/4\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1/4\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst1/5\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1/5\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst1/6\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1/6\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst1/7\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1/7\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst1/8\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1/8\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst1/9\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1/9\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst1/sub
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst1/sub
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/copy-coll-dst2
+DELETE http://localhost/remote\.php/dav/files/user1/test/copy-coll-dst2
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_nodestcoll.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_nodestcoll.regexp
index 3da83a3057c..8933da8f472 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_nodestcoll.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_nodestcoll.regexp
@@ -1,12 +1,12 @@
-MKCOL http://localhost/remote\.php/webdav/test/copy-nodestcoll-src
+MKCOL http://localhost/remote\.php/dav/files/user1/test/copy-nodestcoll-src
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-COPY http://localhost/remote\.php/webdav/test/copy-nodestcoll-src
+COPY http://localhost/remote\.php/dav/files/user1/test/copy-nodestcoll-src
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/nonesuch/dst
+destination: http://localhost/remote\.php/dav/files/user1/test/nonesuch/dst
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
\ No newline at end of file
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_overwrite.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_overwrite.regexp
index 2054c6ff10f..1fd38c2db83 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_overwrite.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_overwrite.regexp
@@ -1,24 +1,24 @@
-MKCOL http://localhost/remote\.php/webdav/test/copy-overwrite-src
+MKCOL http://localhost/remote\.php/dav/files/user1/test/copy-overwrite-src
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-MKCOL http://localhost/remote\.php/webdav/test/copy-overwrite-dst
+MKCOL http://localhost/remote\.php/dav/files/user1/test/copy-overwrite-dst
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-COPY http://localhost/remote\.php/webdav/test/copy-overwrite-src
+COPY http://localhost/remote\.php/dav/files/user1/test/copy-overwrite-src
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/copy-overwrite-dst
+destination: http://localhost/remote\.php/dav/files/user1/test/copy-overwrite-dst
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
-COPY http://localhost/remote\.php/webdav/test/copy-overwrite-src
+COPY http://localhost/remote\.php/dav/files/user1/test/copy-overwrite-src
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/copy-overwrite-dst
+destination: http://localhost/remote\.php/dav/files/user1/test/copy-overwrite-dst
 ocs-apirequest: true
 overwrite: T
 requesttoken: token
\ No newline at end of file
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_simple.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_simple.regexp
index bd5f7db80e2..d0bb3840327 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_simple.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/copy_simple.regexp
@@ -1,12 +1,12 @@
-MKCOL http://localhost/remote\.php/webdav/test/copy-simple-src
+MKCOL http://localhost/remote\.php/dav/files/user1/test/copy-simple-src
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-COPY http://localhost/remote\.php/webdav/test/copy-simple-src
+COPY http://localhost/remote\.php/dav/files/user1/test/copy-simple-src
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/copy-simple-dst
+destination: http://localhost/remote\.php/dav/files/user1/test/copy-simple-dst
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
\ No newline at end of file
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/move.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/move.regexp
index c0f2ba63bf4..5649b8e58d2 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/move.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/move.regexp
@@ -1,38 +1,38 @@
-PUT http://localhost/remote\.php/webdav/test/move-src1\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-src1\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-src2\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-src2\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-MKCOL http://localhost/remote\.php/webdav/test/move-coll
+MKCOL http://localhost/remote\.php/dav/files/user1/test/move-coll
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-MOVE http://localhost/remote\.php/webdav/test/move-src1\.txt
+MOVE http://localhost/remote\.php/dav/files/user1/test/move-src1\.txt
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/move-dst\.txt
+destination: http://localhost/remote\.php/dav/files/user1/test/move-dst\.txt
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
-MOVE http://localhost/remote\.php/webdav/test/move-src2\.txt
+MOVE http://localhost/remote\.php/dav/files/user1/test/move-src2\.txt
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/move-dst\.txt
+destination: http://localhost/remote\.php/dav/files/user1/test/move-dst\.txt
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
-MOVE http://localhost/remote\.php/webdav/test/move-src2\.txt
+MOVE http://localhost/remote\.php/dav/files/user1/test/move-src2\.txt
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/move-dst\.txt
+destination: http://localhost/remote\.php/dav/files/user1/test/move-dst\.txt
 ocs-apirequest: true
 overwrite: T
 requesttoken: token
\ No newline at end of file
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/move_coll.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/move_coll.regexp
index 6e0c270729b..41b904b15c0 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/copymove/move_coll.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/copymove/move_coll.regexp
@@ -1,173 +1,173 @@
-MKCOL http://localhost/remote\.php/webdav/test/move-coll-src
+MKCOL http://localhost/remote\.php/dav/files/user1/test/move-coll-src
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-MKCOL http://localhost/remote\.php/webdav/test/move-coll-src/sub
+MKCOL http://localhost/remote\.php/dav/files/user1/test/move-coll-src/sub
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-coll-src/0\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-coll-src/0\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-coll-src/1\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-coll-src/1\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-coll-src/2\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-coll-src/2\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-coll-src/3\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-coll-src/3\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-coll-src/4\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-coll-src/4\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-coll-src/5\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-coll-src/5\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-coll-src/6\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-coll-src/6\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-coll-src/7\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-coll-src/7\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-coll-src/8\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-coll-src/8\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-coll-src/9\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/move-coll-src/9\.txt
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/move-coll-noncoll
+PUT http://localhost/remote\.php/dav/files/user1/test/move-coll-noncoll
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-COPY http://localhost/remote\.php/webdav/test/move-coll-src
+COPY http://localhost/remote\.php/dav/files/user1/test/move-coll-src
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/move-coll-dst2
+destination: http://localhost/remote\.php/dav/files/user1/test/move-coll-dst2
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
-MOVE http://localhost/remote\.php/webdav/test/move-coll-src
+MOVE http://localhost/remote\.php/dav/files/user1/test/move-coll-src
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/move-coll-dst1
+destination: http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
-MOVE http://localhost/remote\.php/webdav/test/move-coll-dst1
+MOVE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/move-coll-dst2
+destination: http://localhost/remote\.php/dav/files/user1/test/move-coll-dst2
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
-MOVE http://localhost/remote\.php/webdav/test/move-coll-dst2
+MOVE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst2
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/move-coll-dst1
+destination: http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1
 ocs-apirequest: true
 overwrite: T
 requesttoken: token
-COPY http://localhost/remote\.php/webdav/test/move-coll-dst1
+COPY http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/move-coll-dst2
+destination: http://localhost/remote\.php/dav/files/user1/test/move-coll-dst2
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/move-coll-dst1/0\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1/0\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/move-coll-dst1/1\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1/1\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/move-coll-dst1/2\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1/2\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/move-coll-dst1/3\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1/3\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/move-coll-dst1/4\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1/4\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/move-coll-dst1/5\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1/5\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/move-coll-dst1/6\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1/6\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/move-coll-dst1/7\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1/7\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/move-coll-dst1/8\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1/8\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/move-coll-dst1/9\.txt
+DELETE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1/9\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-DELETE http://localhost/remote\.php/webdav/test/move-coll-dst1/sub
+DELETE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst1/sub
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-MOVE http://localhost/remote\.php/webdav/test/move-coll-dst2
+MOVE http://localhost/remote\.php/dav/files/user1/test/move-coll-dst2
 authorization: Bearer mock
 content-type: application/xml
-destination: http://localhost/remote\.php/webdav/test/move-coll-noncoll
+destination: http://localhost/remote\.php/dav/files/user1/test/move-coll-noncoll
 ocs-apirequest: true
 overwrite: F
 requesttoken: token
\ No newline at end of file
diff --git a/packages/nextcloud/test/fixtures/webdav/litmus/largefile/large_get.regexp b/packages/nextcloud/test/fixtures/webdav/litmus/largefile/large_get.regexp
index 13b28562a97..96571fa2874 100644
--- a/packages/nextcloud/test/fixtures/webdav/litmus/largefile/large_get.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/litmus/largefile/large_get.regexp
@@ -1,11 +1,11 @@
-PUT http://localhost/remote\.php/webdav/test/largefile\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/largefile\.txt
 authorization: Bearer mock
 content-length: 1000000000
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 .*
-GET http://localhost/remote\.php/webdav/test/largefile\.txt
+GET http://localhost/remote\.php/dav/files/user1/test/largefile\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/remove_properties.regexp b/packages/nextcloud/test/fixtures/webdav/remove_properties.regexp
index 115022bf413..c0e1ca4f6ae 100644
--- a/packages/nextcloud/test/fixtures/webdav/remove_properties.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/remove_properties.regexp
@@ -1,29 +1,29 @@
-PUT http://localhost/remote\.php/webdav/test/remove-props\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/remove-props\.txt
 authorization: Bearer mock
 content-length: 4
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 test
-PROPPATCH http://localhost/remote\.php/webdav/test/remove-props\.txt
+PROPPATCH http://localhost/remote\.php/dav/files/user1/test/remove-props\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 <d:propertyupdate xmlns:d="DAV:" xmlns:oc="http://owncloud\.org/ns" xmlns:nc="http://nextcloud\.org/ns" xmlns:ocs="http://open-collaboration-services\.org/ns" xmlns:ocm="http://open-cloud-mesh\.org/ns"><d:set><d:prop><oc:favorite>true</oc:favorite></d:prop></d:set></d:propertyupdate>
-PROPFIND http://localhost/remote\.php/webdav/test/remove-props\.txt
+PROPFIND http://localhost/remote\.php/dav/files/user1/test/remove-props\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 <d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud\.org/ns" xmlns:nc="http://nextcloud\.org/ns" xmlns:ocs="http://open-collaboration-services\.org/ns" xmlns:ocm="http://open-cloud-mesh\.org/ns"><d:prop><nc:creation_time/><nc:upload_time/><oc:favorite/></d:prop></d:propfind>
-PROPPATCH http://localhost/remote\.php/webdav/test/remove-props\.txt
+PROPPATCH http://localhost/remote\.php/dav/files/user1/test/remove-props\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 <d:propertyupdate xmlns:d="DAV:" xmlns:oc="http://owncloud\.org/ns" xmlns:nc="http://nextcloud\.org/ns" xmlns:ocs="http://open-collaboration-services\.org/ns" xmlns:ocm="http://open-cloud-mesh\.org/ns"><d:remove><d:prop><oc:favorite/></d:prop></d:remove></d:propertyupdate>
-PROPFIND http://localhost/remote\.php/webdav/test/remove-props\.txt
+PROPFIND http://localhost/remote\.php/dav/files/user1/test/remove-props\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/set_and_get_tags.regexp b/packages/nextcloud/test/fixtures/webdav/set_and_get_tags.regexp
index 447d6c50d87..66d3a4bf2db 100644
--- a/packages/nextcloud/test/fixtures/webdav/set_and_get_tags.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/set_and_get_tags.regexp
@@ -1,17 +1,17 @@
-PUT http://localhost/remote\.php/webdav/test/tags\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/tags\.txt
 authorization: Bearer mock
 content-length: 4
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 test
-PROPPATCH http://localhost/remote\.php/webdav/test/tags\.txt
+PROPPATCH http://localhost/remote\.php/dav/files/user1/test/tags\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 <d:propertyupdate xmlns:d="DAV:" xmlns:oc="http://owncloud\.org/ns" xmlns:nc="http://nextcloud\.org/ns" xmlns:ocs="http://open-collaboration-services\.org/ns" xmlns:ocm="http://open-cloud-mesh\.org/ns"><d:set><d:prop><oc:tags><oc:tag>example</oc:tag></oc:tags></d:prop></d:set></d:propertyupdate>
-PROPFIND http://localhost/remote\.php/webdav/test/tags\.txt
+PROPFIND http://localhost/remote\.php/dav/files/user1/test/tags\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/set_properties.regexp b/packages/nextcloud/test/fixtures/webdav/set_properties.regexp
index 001a32cc24c..d6392cb03ef 100644
--- a/packages/nextcloud/test/fixtures/webdav/set_properties.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/set_properties.regexp
@@ -1,4 +1,4 @@
-PUT http://localhost/remote\.php/webdav/test/set-props\.txt
+PUT http://localhost/remote\.php/dav/files/user1/test/set-props\.txt
 authorization: Bearer mock
 content-length: 4
 content-type: application/xml
@@ -7,13 +7,13 @@ requesttoken: token
 x-oc-ctime: 34214400
 x-oc-mtime: 68256000
 test
-PROPPATCH http://localhost/remote\.php/webdav/test/set-props\.txt
+PROPPATCH http://localhost/remote\.php/dav/files/user1/test/set-props\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 <d:propertyupdate xmlns:d="DAV:" xmlns:oc="http://owncloud\.org/ns" xmlns:nc="http://nextcloud\.org/ns" xmlns:ocs="http://open-collaboration-services\.org/ns" xmlns:ocm="http://open-cloud-mesh\.org/ns"><d:set><d:prop><oc:favorite>true</oc:favorite></d:prop></d:set></d:propertyupdate>
-PROPFIND http://localhost/remote\.php/webdav/test/set-props\.txt
+PROPFIND http://localhost/remote\.php/dav/files/user1/test/set-props\.txt
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/upload_and_download_empty_file.regexp b/packages/nextcloud/test/fixtures/webdav/upload_and_download_empty_file.regexp
index f1ae5f780fe..839c9f8e5e3 100644
--- a/packages/nextcloud/test/fixtures/webdav/upload_and_download_empty_file.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/upload_and_download_empty_file.regexp
@@ -1,10 +1,10 @@
-PUT http://localhost/remote\.php/webdav/test/empty-file
+PUT http://localhost/remote\.php/dav/files/user1/test/empty-file
 authorization: Bearer mock
 content-length: 0
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-GET http://localhost/remote\.php/webdav/test/empty-file
+GET http://localhost/remote\.php/dav/files/user1/test/empty-file
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/upload_and_download_file.regexp b/packages/nextcloud/test/fixtures/webdav/upload_and_download_file.regexp
index 156b9123250..382081fe29f 100644
--- a/packages/nextcloud/test/fixtures/webdav/upload_and_download_file.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/upload_and_download_file.regexp
@@ -1,11 +1,11 @@
-PUT http://localhost/remote\.php/webdav/test/upload_file\.png
+PUT http://localhost/remote\.php/dav/files/user1/test/upload_file\.png
 authorization: Bearer mock
 content-length: 8650
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-iVBORw0KGgoAAAANSUhEUgAAB4AAAAQ4CAIAAABnsVYUAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH5AMPEAwo2\+TdNAAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAACAASURBVHja7NgxAQAgDMAwQMH8O8IVJuiXSOjZfWcWAAAAAAD8diQAAAAAAKBgQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQB/dqxYwEAAACAQf7Wo9hXGAEAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADZL2FUgAAAThJREFUAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwCKNfglZ0nZIRwAAAABJRU5ErkJggg==
-GET http://localhost/remote\.php/webdav/test/upload_file\.png
+.+
+GET http://localhost/remote\.php/dav/files/user1/test/upload_file\.png
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/upload_and_download_stream.regexp b/packages/nextcloud/test/fixtures/webdav/upload_and_download_stream.regexp
index f86ec81361a..8fcef784e3e 100644
--- a/packages/nextcloud/test/fixtures/webdav/upload_and_download_stream.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/upload_and_download_stream.regexp
@@ -1,11 +1,11 @@
-PUT http://localhost/remote\.php/webdav/test/upload_stream\.png
+PUT http://localhost/remote\.php/dav/files/user1/test/upload_stream\.png
 authorization: Bearer mock
 content-length: 8650
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-iVBORw0KGgoAAAANSUhEUgAAB4AAAAQ4CAIAAABnsVYUAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH5AMPEAwo2\+TdNAAAABl0RVh0Q29tbWVudABDcmVhdGVkIHdpdGggR0lNUFeBDhcAACAASURBVHja7NgxAQAgDMAwQMH8O8IVJuiXSOjZfWcWAAAAAAD8diQAAAAAAKBgQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQBDQAAAABAwoAGAAAAACBhQAMAAAAAkDCgAQAAAABIGNAAAAAAACQMaAAAAAAAEgY0AAAAAAAJAxoAAAAAgIQB/dqxYwEAAACAQf7Wo9hXGAEAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADZL2FUgAAAThJREFUAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwEJAAwAAAACwENAAAAAAACwENAAAAAAACwENAAAAAMBCQAMAAAAAsBDQAAAAAAAsBDQAAAAAAAsBDQAAAADAQkADAAAAALAQ0AAAAAAALAQ0AAAAAAALAQ0AAAAAwCKNfglZ0nZIRwAAAABJRU5ErkJggg==
-GET http://localhost/remote\.php/webdav/test/upload_stream\.png
+.+
+GET http://localhost/remote\.php/dav/files/user1/test/upload_stream\.png
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/upload_file_with_checksum.regexp b/packages/nextcloud/test/fixtures/webdav/upload_file_with_checksum.regexp
index eeb45bab01c..df4cf47af3d 100644
--- a/packages/nextcloud/test/fixtures/webdav/upload_file_with_checksum.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/upload_file_with_checksum.regexp
@@ -1,4 +1,4 @@
-PUT http://localhost/remote\.php/webdav/test/checksum\.png
+PUT http://localhost/remote\.php/dav/files/user1/test/checksum\.png
 authorization: Bearer mock
 content-length: 8650
 content-type: application/xml
@@ -6,7 +6,7 @@ oc-checksum: md5:abc
 ocs-apirequest: true
 requesttoken: token
 .+
-PROPFIND http://localhost/remote\.php/webdav/test/checksum\.png
+PROPFIND http://localhost/remote\.php/dav/files/user1/test/checksum\.png
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/upload_overwrite/data.regexp b/packages/nextcloud/test/fixtures/webdav/upload_overwrite/data.regexp
index 1555b95895f..9207a926c7f 100644
--- a/packages/nextcloud/test/fixtures/webdav/upload_overwrite/data.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/upload_overwrite/data.regexp
@@ -1,23 +1,23 @@
-PUT http://localhost/remote\.php/webdav/test/upload_overwrite\.png
+PUT http://localhost/remote\.php/dav/files/user1/test/upload_overwrite\.png
 authorization: Bearer mock
 content-length: 3
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 123
-GET http://localhost/remote\.php/webdav/test/upload_overwrite\.png
+GET http://localhost/remote\.php/dav/files/user1/test/upload_overwrite\.png
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/upload_overwrite\.png
+PUT http://localhost/remote\.php/dav/files/user1/test/upload_overwrite\.png
 authorization: Bearer mock
 content-length: 3
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 456
-GET http://localhost/remote\.php/webdav/test/upload_overwrite\.png
+GET http://localhost/remote\.php/dav/files/user1/test/upload_overwrite\.png
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
diff --git a/packages/nextcloud/test/fixtures/webdav/upload_overwrite/stream.regexp b/packages/nextcloud/test/fixtures/webdav/upload_overwrite/stream.regexp
index 1555b95895f..9207a926c7f 100644
--- a/packages/nextcloud/test/fixtures/webdav/upload_overwrite/stream.regexp
+++ b/packages/nextcloud/test/fixtures/webdav/upload_overwrite/stream.regexp
@@ -1,23 +1,23 @@
-PUT http://localhost/remote\.php/webdav/test/upload_overwrite\.png
+PUT http://localhost/remote\.php/dav/files/user1/test/upload_overwrite\.png
 authorization: Bearer mock
 content-length: 3
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 123
-GET http://localhost/remote\.php/webdav/test/upload_overwrite\.png
+GET http://localhost/remote\.php/dav/files/user1/test/upload_overwrite\.png
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
-PUT http://localhost/remote\.php/webdav/test/upload_overwrite\.png
+PUT http://localhost/remote\.php/dav/files/user1/test/upload_overwrite\.png
 authorization: Bearer mock
 content-length: 3
 content-type: application/xml
 ocs-apirequest: true
 requesttoken: token
 456
-GET http://localhost/remote\.php/webdav/test/upload_overwrite\.png
+GET http://localhost/remote\.php/dav/files/user1/test/upload_overwrite\.png
 authorization: Bearer mock
 content-type: application/xml
 ocs-apirequest: true