diff --git a/src/config/services.php b/src/config/services.php
--- a/src/config/services.php
+++ b/src/config/services.php
@@ -61,6 +61,10 @@
         'verify' => (bool) env('DAV_VERIFY', true),
     ],
 
+    'autodiscover' => [
+        'uri' => env('AUTODISCOVER_URI', env('APP_URL', 'http://localhost')),
+    ],
+
     'activesync' => [
         'uri' => env('ACTIVESYNC_URI', 'https://proxy/Microsoft-Server-ActiveSync'),
     ],
diff --git a/src/tests/Feature/Backends/IMAPTest.php b/src/tests/Feature/Backends/IMAPTest.php
--- a/src/tests/Feature/Backends/IMAPTest.php
+++ b/src/tests/Feature/Backends/IMAPTest.php
@@ -140,11 +140,12 @@
      * Test creating/updating/deleting an IMAP account
      *
      * @group imap
+     * @group ldap
      */
     public function testUsers(): void
     {
         $this->user = $user = $this->getTestUser('test-' . time() . '@' . \config('app.domain'), [], true);
-        $storage = \App\Sku::withEnvTenantContext()->where('title', 'storage')->first();
+        $storage = \App\Sku::withObjectTenantContext($user)->where('title', 'storage')->first();
         $user->assignSku($storage, 1, $user->wallets->first());
 
         // User must be in ldap, so imap auth works
diff --git a/src/tests/Feature/Backends/LDAPTest.php b/src/tests/Feature/Backends/LDAPTest.php
--- a/src/tests/Feature/Backends/LDAPTest.php
+++ b/src/tests/Feature/Backends/LDAPTest.php
@@ -23,6 +23,10 @@
     {
         parent::setUp();
 
+        if (!\config('app.with_ldap')) {
+            $this->markTestSkipped();
+        }
+
         $this->ldap_config = [
             'ldap.hosts' => \config('ldap.hosts'),
         ];
diff --git a/src/tests/Feature/Controller/DomainsTest.php b/src/tests/Feature/Controller/DomainsTest.php
--- a/src/tests/Feature/Controller/DomainsTest.php
+++ b/src/tests/Feature/Controller/DomainsTest.php
@@ -433,6 +433,8 @@
      */
     public function testStatus(): void
     {
+        $withLdap = \config('app.with_ldap');
+
         $john = $this->getTestUser('john@kolab.org');
         $jack = $this->getTestUser('jack@kolab.org');
         $domain = $this->getTestDomain('kolab.org');
@@ -441,7 +443,10 @@
         $response = $this->actingAs($jack)->get("/api/v4/domains/{$domain->id}/status");
         $response->assertStatus(403);
 
-        $domain->status = Domain::STATUS_NEW | Domain::STATUS_ACTIVE | Domain::STATUS_LDAP_READY;
+        $domain->status = Domain::STATUS_NEW | Domain::STATUS_ACTIVE;
+        if ($withLdap) {
+            $domain->status |= Domain::STATUS_LDAP_READY;
+        }
         $domain->save();
 
         // Get domain status
@@ -449,7 +454,6 @@
         $response->assertStatus(200);
 
         $json = $response->json();
-        $withLdap = \config('app.with_ldap');
 
         $this->assertFalse($json['isVerified']);
         $this->assertFalse($json['isReady']);
diff --git a/src/tests/Feature/Controller/GroupsTest.php b/src/tests/Feature/Controller/GroupsTest.php
--- a/src/tests/Feature/Controller/GroupsTest.php
+++ b/src/tests/Feature/Controller/GroupsTest.php
@@ -326,16 +326,21 @@
 
         $json = $response->json();
 
-        $this->assertFalse($json['isLdapReady']);
-        $this->assertFalse($json['isReady']);
+        if (\config('app.with_ldap')) {
+            $this->assertFalse($json['isLdapReady']);
+            $this->assertFalse($json['isReady']);
+            $this->assertCount(6, $json['process']);
+            $this->assertSame('distlist-ldap-ready', $json['process'][1]['label']);
+            $this->assertSame(false, $json['process'][1]['state']);
+        } else {
+            $this->assertCount(4, $json['process']);
+            $this->assertTrue($json['isReady']);
+        }
         $this->assertFalse($json['isSuspended']);
         $this->assertTrue($json['isActive']);
         $this->assertFalse($json['isDeleted']);
-        $this->assertCount(6, $json['process']);
         $this->assertSame('distlist-new', $json['process'][0]['label']);
         $this->assertSame(true, $json['process'][0]['state']);
-        $this->assertSame('distlist-ldap-ready', $json['process'][1]['label']);
-        $this->assertSame(false, $json['process'][1]['state']);
         $this->assertTrue(empty($json['status']));
         $this->assertTrue(empty($json['message']));
 
@@ -350,11 +355,13 @@
 
         $json = $response->json();
 
-        $this->assertTrue($json['isLdapReady']);
+        if (\config('app.with_ldap')) {
+            $this->assertTrue($json['isLdapReady']);
+            $this->assertCount(6, $json['process']);
+            $this->assertSame('distlist-ldap-ready', $json['process'][1]['label']);
+            $this->assertSame(true, $json['process'][1]['state']);
+        }
         $this->assertTrue($json['isReady']);
-        $this->assertCount(6, $json['process']);
-        $this->assertSame('distlist-ldap-ready', $json['process'][1]['label']);
-        $this->assertSame(true, $json['process'][1]['state']);
         $this->assertSame('success', $json['status']);
         $this->assertSame('Setup process finished successfully.', $json['message']);
 
@@ -367,11 +374,13 @@
 
         $json = $response->json();
 
-        $this->assertTrue($json['isLdapReady']);
+        if (\config('app.with_ldap')) {
+            $this->assertTrue($json['isLdapReady']);
+            $this->assertCount(6, $json['process']);
+            $this->assertSame('distlist-ldap-ready', $json['process'][1]['label']);
+            $this->assertSame(true, $json['process'][1]['state']);
+        }
         $this->assertTrue($json['isReady']);
-        $this->assertCount(6, $json['process']);
-        $this->assertSame('distlist-ldap-ready', $json['process'][1]['label']);
-        $this->assertSame(true, $json['process'][1]['state']);
         $this->assertSame('success', $json['status']);
         $this->assertSame('Setup process finished successfully.', $json['message']);
     }
@@ -391,13 +400,19 @@
 
         $result = GroupsController::statusInfo($group);
 
-        $this->assertFalse($result['isDone']);
-        $this->assertCount(6, $result['process']);
-        $this->assertSame('distlist-new', $result['process'][0]['label']);
-        $this->assertSame(true, $result['process'][0]['state']);
-        $this->assertSame('distlist-ldap-ready', $result['process'][1]['label']);
-        $this->assertSame(false, $result['process'][1]['state']);
-        $this->assertSame('running', $result['processState']);
+        if (\config('app.with_ldap')) {
+            $this->assertFalse($result['isDone']);
+            $this->assertCount(6, $result['process']);
+            $this->assertSame('distlist-new', $result['process'][0]['label']);
+            $this->assertSame(true, $result['process'][0]['state']);
+            $this->assertSame('distlist-ldap-ready', $result['process'][1]['label']);
+            $this->assertSame(false, $result['process'][1]['state']);
+            $this->assertSame('running', $result['processState']);
+        } else {
+            $this->assertTrue($result['isDone']);
+            $this->assertSame('done', $result['processState']);
+            $this->markTestSkipped();
+        }
 
         $group->created_at = Carbon::now()->subSeconds(181);
         $group->save();
diff --git a/src/tests/Feature/Controller/ResourcesTest.php b/src/tests/Feature/Controller/ResourcesTest.php
--- a/src/tests/Feature/Controller/ResourcesTest.php
+++ b/src/tests/Feature/Controller/ResourcesTest.php
@@ -358,23 +358,26 @@
 
         $json = $response->json();
 
-        $this->assertFalse($json['isReady']);
         $this->assertTrue($json['isImapReady']);
+        $this->assertSame('success', $json['status']);
         if (\config('app.with_ldap')) {
+            $this->assertFalse($json['isReady']);
             $this->assertFalse($json['isLdapReady']);
             $this->assertSame('resource-ldap-ready', $json['process'][1]['label']);
             $this->assertSame(false, $json['process'][1]['state']);
             $this->assertSame('resource-imap-ready', $json['process'][2]['label']);
             $this->assertSame(true, $json['process'][2]['state']);
+            $this->assertSame('Setup process has been pushed. Please wait.', $json['message']);
+            $this->assertSame('waiting', $json['processState']);
+
+            Queue::assertPushed(\App\Jobs\Resource\CreateJob::class, 1);
         } else {
+            $this->assertTrue($json['isReady']);
             $this->assertSame('resource-imap-ready', $json['process'][1]['label']);
             $this->assertSame(true, $json['process'][1]['state']);
+            $this->assertSame('Setup process finished successfully.', $json['message']);
+            $this->assertSame('done', $json['processState']);
         }
-        $this->assertSame('success', $json['status']);
-        $this->assertSame('Setup process has been pushed. Please wait.', $json['message']);
-        $this->assertSame('waiting', $json['processState']);
-
-        Queue::assertPushed(\App\Jobs\Resource\CreateJob::class, 1);
 
         // Test a case when a domain is not ready
         Queue::fake();
@@ -386,17 +389,21 @@
 
         $json = $response->json();
 
-        $this->assertFalse($json['isReady']);
+        $this->assertSame('success', $json['status']);
         if (\config('app.with_ldap')) {
+            $this->assertFalse($json['isReady']);
             $this->assertFalse($json['isLdapReady']);
             $this->assertSame('resource-ldap-ready', $json['process'][1]['label']);
             $this->assertSame(false, $json['process'][1]['state']);
-        }
-        $this->assertSame('success', $json['status']);
-        $this->assertSame('Setup process has been pushed. Please wait.', $json['message']);
-        $this->assertSame('waiting', $json['processState']);
+            $this->assertSame('Setup process has been pushed. Please wait.', $json['message']);
+            $this->assertSame('waiting', $json['processState']);
 
-        Queue::assertPushed(\App\Jobs\Resource\CreateJob::class, 1);
+            Queue::assertPushed(\App\Jobs\Resource\CreateJob::class, 1);
+        } else {
+            $this->assertSame('Setup process finished successfully.', $json['message']);
+            $this->assertTrue($json['isReady']);
+            $this->assertSame('done', $json['processState']);
+        }
     }
 
     /**
diff --git a/src/tests/Feature/Controller/SharedFoldersTest.php b/src/tests/Feature/Controller/SharedFoldersTest.php
--- a/src/tests/Feature/Controller/SharedFoldersTest.php
+++ b/src/tests/Feature/Controller/SharedFoldersTest.php
@@ -360,23 +360,29 @@
 
         $json = $response->json();
 
-        $this->assertTrue($json['isImapReady']);
-        $this->assertFalse($json['isReady']);
+        if (config('app.with_imap')) {
+            $this->assertTrue($json['isImapReady']);
+        }
+
         if (\config('app.with_ldap')) {
+            $this->assertFalse($json['isReady']);
             $this->assertFalse($json['isLdapReady']);
             $this->assertSame('shared-folder-ldap-ready', $json['process'][1]['label']);
             $this->assertSame(false, $json['process'][1]['state']);
             $this->assertSame('shared-folder-imap-ready', $json['process'][2]['label']);
             $this->assertSame(true, $json['process'][2]['state']);
+            $this->assertSame('Setup process has been pushed. Please wait.', $json['message']);
+            $this->assertSame('waiting', $json['processState']);
+
+            Queue::assertPushed(\App\Jobs\SharedFolder\CreateJob::class, 1);
         } else {
+            $this->assertTrue($json['isReady']);
             $this->assertSame('shared-folder-imap-ready', $json['process'][1]['label']);
             $this->assertSame(true, $json['process'][1]['state']);
+            $this->assertSame('Setup process finished successfully.', $json['message']);
+            $this->assertSame('done', $json['processState']);
         }
         $this->assertSame('success', $json['status']);
-        $this->assertSame('Setup process has been pushed. Please wait.', $json['message']);
-        $this->assertSame('waiting', $json['processState']);
-
-        Queue::assertPushed(\App\Jobs\SharedFolder\CreateJob::class, 1);
 
         // Test a case when a domain is not ready
         Queue::fake();
@@ -389,20 +395,21 @@
         $json = $response->json();
 
         $this->assertTrue($json['isImapReady']);
-        $this->assertFalse($json['isReady']);
+        $this->assertSame('success', $json['status']);
         if (\config('app.with_ldap')) {
+            $this->assertFalse($json['isReady']);
             $this->assertFalse($json['isLdapReady']);
             $this->assertSame('shared-folder-ldap-ready', $json['process'][1]['label']);
             $this->assertSame(false, $json['process'][1]['state']);
+            $this->assertSame('Setup process has been pushed. Please wait.', $json['message']);
+
+            Queue::assertPushed(\App\Jobs\SharedFolder\CreateJob::class, 1);
         } else {
+            $this->assertTrue($json['isReady']);
             $this->assertSame('shared-folder-imap-ready', $json['process'][1]['label']);
             $this->assertSame(true, $json['process'][1]['state']);
+            $this->assertSame('done', $json['processState']);
         }
-        $this->assertSame('success', $json['status']);
-        $this->assertSame('Setup process has been pushed. Please wait.', $json['message']);
-        $this->assertSame('waiting', $json['processState']);
-
-        Queue::assertPushed(\App\Jobs\SharedFolder\CreateJob::class, 1);
     }
 
     /**
diff --git a/src/tests/Feature/Jobs/Domain/CreateTest.php b/src/tests/Feature/Jobs/Domain/CreateTest.php
--- a/src/tests/Feature/Jobs/Domain/CreateTest.php
+++ b/src/tests/Feature/Jobs/Domain/CreateTest.php
@@ -49,7 +49,9 @@
         $job = new \App\Jobs\Domain\CreateJob($domain->id);
         $job->handle();
 
-        $this->assertTrue($domain->fresh()->isLdapReady());
+        if (\config('app.with_ldap')) {
+            $this->assertTrue($domain->fresh()->isLdapReady());
+        }
 
         Queue::assertPushed(\App\Jobs\Domain\VerifyJob::class, 1);
 
diff --git a/src/tests/Feature/Jobs/Group/CreateTest.php b/src/tests/Feature/Jobs/Group/CreateTest.php
--- a/src/tests/Feature/Jobs/Group/CreateTest.php
+++ b/src/tests/Feature/Jobs/Group/CreateTest.php
@@ -31,14 +31,20 @@
      */
     public function testHandle(): void
     {
-        $group = $this->getTestGroup('group@kolab.org', ['members' => []]);
+        $group = $this->getTestGroup('group@kolab.org', ['members' => [], 'status' => Group::STATUS_NEW]);
 
         $this->assertFalse($group->isLdapReady());
 
         $job = new \App\Jobs\Group\CreateJob($group->id);
         $job->handle();
 
-        $this->assertTrue($group->fresh()->isLdapReady());
+        $group->refresh();
+
+        if (!\config('app.with_ldap')) {
+            $this->assertTrue($group->isActive());
+        } else {
+            $this->assertTrue($group->isLdapReady());
+        }
 
         // Test non-existing group ID
         $this->expectException(\Exception::class);
diff --git a/src/tests/Feature/Jobs/Group/DeleteTest.php b/src/tests/Feature/Jobs/Group/DeleteTest.php
--- a/src/tests/Feature/Jobs/Group/DeleteTest.php
+++ b/src/tests/Feature/Jobs/Group/DeleteTest.php
@@ -41,7 +41,13 @@
         $job = new \App\Jobs\Group\CreateJob($group->id);
         $job->handle();
 
-        $this->assertTrue($group->fresh()->isLdapReady());
+        $group->refresh();
+
+        if (\config('app.with_ldap')) {
+            $this->assertTrue($group->isLdapReady());
+        } else {
+            $this->assertFalse($group->isLdapReady());
+        }
 
         Queue::fake();
 
diff --git a/src/tests/Feature/Jobs/Group/UpdateTest.php b/src/tests/Feature/Jobs/Group/UpdateTest.php
--- a/src/tests/Feature/Jobs/Group/UpdateTest.php
+++ b/src/tests/Feature/Jobs/Group/UpdateTest.php
@@ -44,6 +44,16 @@
 
         // Create the group
         $group = $this->getTestGroup('group@kolab.org', ['members' => []]);
+
+        if (!\config('app.with_ldap')) {
+            $job = new \App\Jobs\Group\UpdateJob($group->id);
+            $job->handle();
+
+            $this->assertTrue($job->isDeleted());
+            $this->markTestSkipped();
+        }
+
+        // Create the group in LDAP
         LDAP::createGroup($group);
 
         // Test if group properties (members) actually changed in LDAP
diff --git a/src/tests/Feature/Jobs/Resource/UpdateTest.php b/src/tests/Feature/Jobs/Resource/UpdateTest.php
--- a/src/tests/Feature/Jobs/Resource/UpdateTest.php
+++ b/src/tests/Feature/Jobs/Resource/UpdateTest.php
@@ -61,9 +61,11 @@
         $job = new \App\Jobs\Resource\UpdateJob($resource->id);
         $job->handle();
 
-        $ldap_resource = LDAP::getResource($resource->email);
+        if (\config('app.with_ldap')) {
+            $ldap_resource = LDAP::getResource($resource->email);
 
-        $this->assertSame('ACT_ACCEPT', $ldap_resource['kolabinvitationpolicy']);
+            $this->assertSame('ACT_ACCEPT', $ldap_resource['kolabinvitationpolicy']);
+        }
 
         // TODO: Assert IMAP change worked
 
diff --git a/src/tests/Feature/Jobs/SharedFolder/CreateTest.php b/src/tests/Feature/Jobs/SharedFolder/CreateTest.php
--- a/src/tests/Feature/Jobs/SharedFolder/CreateTest.php
+++ b/src/tests/Feature/Jobs/SharedFolder/CreateTest.php
@@ -59,8 +59,16 @@
         $folder->refresh();
 
         $this->assertFalse($job->hasFailed());
-        $this->assertTrue($folder->isLdapReady());
-        $this->assertTrue($folder->isImapReady());
+        if (\config('app.with_ldap')) {
+            $this->assertTrue($folder->isLdapReady());
+        } else {
+            $this->assertFalse($folder->isLdapReady());
+        }
+        if (\config('app.with_imap')) {
+            $this->assertTrue($folder->isImapReady());
+        } else {
+            $this->assertFalse($folder->isImapReady());
+        }
         $this->assertTrue($folder->isActive());
 
         // Test job failures
diff --git a/src/tests/Feature/Jobs/User/CreateTest.php b/src/tests/Feature/Jobs/User/CreateTest.php
--- a/src/tests/Feature/Jobs/User/CreateTest.php
+++ b/src/tests/Feature/Jobs/User/CreateTest.php
@@ -40,9 +40,6 @@
         $domain->save();
 
         // TODO: Make the test working with various with_imap/with_ldap combinations
-        \config(['app.with_imap' => true]);
-        \config(['app.with_ldap' => true]);
-
         $this->assertFalse($user->isLdapReady());
         $this->assertFalse($user->isImapReady());
         $this->assertFalse($user->isActive());
@@ -52,8 +49,16 @@
 
         $user->refresh();
 
-        $this->assertTrue($user->isLdapReady());
-        $this->assertTrue($user->isImapReady());
+        if (\config('app.with_ldap')) {
+            $this->assertTrue($user->isLdapReady());
+        } else {
+            $this->assertFalse($user->isLdapReady());
+        }
+        if (\config('app.with_imap')) {
+            $this->assertTrue($user->isImapReady());
+        } else {
+            $this->assertFalse($user->isImapReady());
+        }
         $this->assertTrue($user->isActive());
         $this->assertFalse($job->hasFailed());
 
diff --git a/src/tests/Feature/Jobs/User/DeleteTest.php b/src/tests/Feature/Jobs/User/DeleteTest.php
--- a/src/tests/Feature/Jobs/User/DeleteTest.php
+++ b/src/tests/Feature/Jobs/User/DeleteTest.php
@@ -86,6 +86,7 @@
         $this->assertTrue($user->isDeleted());
         $this->assertNull($rcdb->table('users')->where('username', $user->email)->first());
 
+        /*
         if (\config('app.with_imap')) {
             Queue::assertPushed(\App\Jobs\IMAP\AclCleanupJob::class, 1);
             Queue::assertPushed(
@@ -97,6 +98,7 @@
                 }
             );
         }
+        */
 
         // TODO: Test partial execution, i.e. only IMAP or only LDAP
     }
diff --git a/src/tests/Feature/Jobs/User/ResyncTest.php b/src/tests/Feature/Jobs/User/ResyncTest.php
--- a/src/tests/Feature/Jobs/User/ResyncTest.php
+++ b/src/tests/Feature/Jobs/User/ResyncTest.php
@@ -50,12 +50,10 @@
             'status' => User::STATUS_LDAP_READY | User::STATUS_IMAP_READY | User::STATUS_ACTIVE,
         ]);
 
-        // TODO: Make the test working with various with_imap/with_ldap combinations
-        \config(['app.with_imap' => true]);
-        \config(['app.with_ldap' => true]);
-
-        $this->assertTrue(empty(LDAP::getDomain($domain->namespace)));
-        $this->assertTrue(empty(LDAP::getUser($user->email)));
+        if (\config('app.with_ldap')) {
+            $this->assertTrue(empty(LDAP::getDomain($domain->namespace)));
+            $this->assertTrue(empty(LDAP::getUser($user->email)));
+        }
 
         // Test a user (and custom domain) that both aren't in ldap (despite their status)
         $job = new \App\Jobs\User\ResyncJob($user->id);
@@ -65,13 +63,15 @@
         $domain->refresh();
 
         $this->assertTrue($user->isLdapReady());
-        $this->assertTrue($user->isImapReady());
         $this->assertTrue($domain->isLdapReady());
-
-        $this->assertTrue(!empty(LDAP::getDomain($domain->namespace)));
-        $this->assertTrue(!empty(LDAP::getUser($user->email)));
+        $this->assertTrue($user->isImapReady());
         $this->assertTrue(IMAP::verifyAccount($user->email));
 
+        if (\config('app.with_ldap')) {
+            $this->assertTrue(!empty(LDAP::getDomain($domain->namespace)));
+            $this->assertTrue(!empty(LDAP::getUser($user->email)));
+        }
+
         // TODO: More tests cases
     }
 }
diff --git a/src/tests/Feature/Jobs/User/UpdateTest.php b/src/tests/Feature/Jobs/User/UpdateTest.php
--- a/src/tests/Feature/Jobs/User/UpdateTest.php
+++ b/src/tests/Feature/Jobs/User/UpdateTest.php
@@ -59,9 +59,11 @@
         $job = new \App\Jobs\User\UpdateJob($user->id);
         $job->handle();
 
-        $ldap_user = LDAP::getUser('new-job-user@' . \config('app.domain'));
+        if (\config('app.with_ldap')) {
+            $ldap_user = LDAP::getUser('new-job-user@' . \config('app.domain'));
 
-        $this->assertSame($aliases, $ldap_user['alias']);
+            $this->assertSame($aliases, $ldap_user['alias']);
+        }
 
         // Test updating aliases list
         $aliases = [
@@ -73,9 +75,11 @@
         $job = new \App\Jobs\User\UpdateJob($user->id);
         $job->handle();
 
-        $ldap_user = LDAP::getUser('new-job-user@' . \config('app.domain'));
+        if (\config('app.with_ldap')) {
+            $ldap_user = LDAP::getUser('new-job-user@' . \config('app.domain'));
 
-        $this->assertSame($aliases, (array) $ldap_user['alias']);
+            $this->assertSame($aliases, (array) $ldap_user['alias']);
+        }
 
         // Test unsetting aliases list
         $aliases = [];
@@ -84,9 +88,11 @@
         $job = new \App\Jobs\User\UpdateJob($user->id);
         $job->handle();
 
-        $ldap_user = LDAP::getUser('new-job-user@' . \config('app.domain'));
+        if (\config('app.with_ldap')) {
+            $ldap_user = LDAP::getUser('new-job-user@' . \config('app.domain'));
 
-        $this->assertTrue(empty($ldap_user['alias']));
+            $this->assertTrue(empty($ldap_user['alias']));
+        }
 
         // Test deleted user
         $user->delete();
diff --git a/src/tests/Infrastructure/ActivesyncTest.php b/src/tests/Infrastructure/ActivesyncTest.php
--- a/src/tests/Infrastructure/ActivesyncTest.php
+++ b/src/tests/Infrastructure/ActivesyncTest.php
@@ -16,7 +16,7 @@
 
     private static function toWbxml($xml)
     {
-        $outputStream = fopen("php://temp", 'r+');
+        $outputStream = fopen('php://temp', 'r+');
         $encoder = new \Syncroton_Wbxml_Encoder($outputStream, 'UTF-8', 3);
         $dom = new \DOMDocument();
         $dom->loadXML($xml);
@@ -108,9 +108,12 @@
                 ],
             ],
         ]]);
-
         if (!self::$user) {
-            self::$user = $this->getTestUser('activesynctest@kolab.org', ['password' => 'simple123'], true);
+            $userProps = [
+                'password' => 'simple123',
+                'status' => \App\User::STATUS_NEW,
+            ];
+            self::$user = $this->getTestUser('activesynctest@kolab.org', $userProps, true);
             //FIXME this shouldn't be required, but it seems to be.
             Roundcube::dbh()->table('kolab_cache_task')->truncate();
             Roundcube::dbh()->table('syncroton_folder')->truncate();
diff --git a/src/tests/Infrastructure/AutodiscoverTest.php b/src/tests/Infrastructure/AutodiscoverTest.php
--- a/src/tests/Infrastructure/AutodiscoverTest.php
+++ b/src/tests/Infrastructure/AutodiscoverTest.php
@@ -17,7 +17,7 @@
         if (!self::$client) {
             self::$client = new \GuzzleHttp\Client([
                 'http_errors' => false, // No exceptions
-                'base_uri' => "http://roundcube/",
+                'base_uri' => \config('services.autodiscover.uri'),
                 'verify' => false,
                 'connect_timeout' => 10,
                 'timeout' => 10,
diff --git a/src/tests/Infrastructure/DavTest.php b/src/tests/Infrastructure/DavTest.php
--- a/src/tests/Infrastructure/DavTest.php
+++ b/src/tests/Infrastructure/DavTest.php
@@ -4,10 +4,15 @@
 
 use Tests\TestCase;
 
+/**
+ * @group dav
+ */
 class DavTest extends TestCase
 {
-    private static ?\GuzzleHttp\Client $client = null;
-    private static ?\App\User $user = null;
+    private ?\GuzzleHttp\Client $client = null;
+    private ?\App\User $user = null;
+    private bool $isCyrus;
+    private string $path;
 
     /**
      * {@inheritDoc}
@@ -16,67 +21,77 @@
     {
         parent::setUp();
 
-        if (!self::$user) {
-            self::$user = $this->getTestUser('davtest@kolab.org', ['password' => 'simple123'], true);
+        if (!$this->user) {
+            $this->user = $this->getTestUser('davtest@kolab.org', ['password' => 'simple123'], true);
         }
 
-        if (!self::$client) {
-            self::$client = new \GuzzleHttp\Client([
+        $baseUri = \config('services.dav.uri');
+        $this->isCyrus = strpos($baseUri, '/iRony') === false;
+        $this->path = $this->isCyrus ? '/dav' : '/iRony';
+
+        if (!$this->client) {
+            $this->client = new \GuzzleHttp\Client([
                 'http_errors' => false, // No exceptions
-                'base_uri' => \config("services.dav.uri"),
+                'base_uri' => $baseUri,
                 'verify' => false,
-                'auth' => [self::$user->email, 'simple123'],
+                'auth' => [$this->user->email, 'simple123'],
                 'connect_timeout' => 10,
                 'timeout' => 10,
                 'headers' => [
-                    "Content-Type" => "application/xml; charset=utf-8",
-                    "Depth" => "1",
+                    'Content-Type' => 'application/xml; charset=utf-8',
+                    'Depth' => '1',
                 ]
             ]);
         }
     }
 
-    public function testDiscoverPrincipal()
+    public function testDiscoverPrincipal(): void
     {
-        $user = self::$user;
         $body = "<d:propfind xmlns:d='DAV:'><d:prop><d:current-user-principal/></d:prop></d:propfind>";
-        $response = self::$client->request('PROPFIND', '/iRony/', ['body' => $body]);
+
+        $response = $this->client->request('PROPFIND', '', ['body' => $body]);
         $this->assertEquals(207, $response->getStatusCode());
+
         $data = $response->getBody();
-        $this->assertStringContainsString("<d:href>/iRony/principals/{$user->email}/</d:href>", $data);
-        $this->assertStringContainsString('<d:href>/iRony/calendars/</d:href>', $data);
-        $this->assertStringContainsString('<d:href>/iRony/addressbooks/</d:href>', $data);
+        $email = $this->user->email;
+
+        if ($this->isCyrus) {
+            $this->assertStringContainsString("<d:href>{$this->path}/principals/user/{$email}/</d:href>", $data);
+        } else {
+            $this->assertStringContainsString("<d:href>{$this->path}/principals/{$email}/</d:href>", $data);
+        }
     }
 
     /**
      * This codepath is triggerd by MacOS CalDAV when it tries to login.
      * Verify we don't crash and end up with a 500 status code.
      */
-    public function testFailingLogin()
+    public function testFailingLogin(): void
     {
         $body = "<d:propfind xmlns:d='DAV:'><d:prop><d:current-user-principal/></d:prop></d:propfind>";
-        $headers = [
-            "Content-Type" => "application/xml; charset=utf-8",
-            "Depth" => "1",
+        $params = [
+            'Content-Type' => 'application/xml; charset=utf-8',
+            'Depth' => '1',
             'body' => $body,
             'auth' => ['invaliduser@kolab.org', 'invalid']
         ];
 
-        $response = self::$client->request('PROPFIND', '/iRony/', $headers);
-        $this->assertEquals(403, $response->getStatusCode());
+        $response = $this->client->request('PROPFIND', '', $params);
+
+        $this->assertSame($this->isCyrus ? 401 : 403, $response->getStatusCode());
     }
 
     /**
      * This codepath is triggerd by MacOS CardDAV when it tries to login.
      * NOTE: This depends on the username_domain roundcube config option.
      */
-    public function testShortlogin()
+    public function testShortlogin(): void
     {
         $this->markTestSkipped('Shortlogins dont work with the nginx proxy.');
 
         // @phpstan-ignore-next-line "Code above always terminates"
         $body = "<d:propfind xmlns:d='DAV:'><d:prop><d:current-user-principal/></d:prop></d:propfind>";
-        $response = self::$client->request('PROPFIND', '/iRony/', [
+        $response = $this->client->request('PROPFIND', '', [
             'body' => $body,
             'auth' => ['davtest', 'simple123']
         ]);
@@ -84,9 +99,8 @@
         $this->assertEquals(207, $response->getStatusCode());
     }
 
-    public function testDiscoverCalendarHomeset()
+    public function testDiscoverCalendarHomeset(): void
     {
-        $user = self::$user;
         $body = <<<EOF
             <d:propfind xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:caldav">
                 <d:prop>
@@ -95,15 +109,22 @@
             </d:propfind>
         EOF;
 
-        $response = self::$client->request('PROPFIND', '/iRony/', ['body' => $body]);
+        $email = $this->user->email;
+        $href = $this->isCyrus ? "principals/user/{$email}" : '';
+
+        $response = $this->client->request('PROPFIND', $href, ['body' => $body]);
         $this->assertEquals(207, $response->getStatusCode());
         $data = $response->getBody();
-        $this->assertStringContainsString("<d:href>/iRony/calendars/{$user->email}/</d:href>", $data);
+
+        if ($this->isCyrus) {
+            $this->assertStringContainsString("<d:href>{$this->path}/calendars/user/{$email}/</d:href>", $data);
+        } else {
+            $this->assertStringContainsString("<d:href>{$this->path}/calendars/{$email}/</d:href>", $data);
+        }
     }
 
-    public function testDiscoverCalendars()
+    public function testDiscoverCalendars(): string
     {
-        $user = self::$user;
         $body = <<<EOF
             <d:propfind xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/" xmlns:c="urn:ietf:params:xml:ns:caldav">
                 <d:prop>
@@ -115,30 +136,42 @@
             </d:propfind>
         EOF;
 
-        $response = self::$client->request('PROPFIND', "/iRony/calendars/{$user->email}", [
+        $params = [
             'headers' => [
-                "Depth" => "infinity",
+                'Depth' => 'infinity',
             ],
-            'body' => $body
-        ]);
+            'body' => $body,
+        ];
+
+        $email = $this->user->email;
+        $href = $this->isCyrus ? "calendars/user/{$email}" : "calendars/{email}";
+
+        $response = $this->client->request('PROPFIND', $href, $params);
+
         $this->assertEquals(207, $response->getStatusCode());
         $data = $response->getBody();
-        $this->assertStringContainsString("<d:href>/iRony/calendars/{$user->email}/</d:href>", $data);
+
+        if ($this->isCyrus) {
+            $this->assertStringContainsString("<d:href>{$this->path}/calendars/user/{$email}/</d:href>", $data);
+        } else {
+            $this->assertStringContainsString("<d:href>{$this->path}/calendars/{$email}/</d:href>", $data);
+        }
 
         $doc = new \DOMDocument('1.0', 'UTF-8');
         $doc->loadXML($data);
         $response = $doc->getElementsByTagName('response')->item(1);
         $doc->getElementsByTagName('href')->item(0);
 
-        $this->assertEquals("d:href", $response->childNodes->item(0)->nodeName);
+        $this->assertEquals('d:href', $response->childNodes->item(0)->nodeName);
         $href = $response->childNodes->item(0)->nodeValue;
+
         return $href;
     }
 
     /**
      * @depends testDiscoverCalendars
      */
-    public function testPropfindCalendar($href)
+    public function testPropfindCalendar($href): void
     {
         $body = <<<EOF
             <d:propfind xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/" xmlns:c="urn:ietf:params:xml:ns:caldav">
@@ -154,12 +187,15 @@
             </d:propfind>
         EOF;
 
-        $response = self::$client->request('PROPFIND', $href, [
+        $params = [
             'headers' => [
-                "Depth" => "0",
+                'Depth' => '0',
             ],
             'body' => $body,
-        ]);
+        ];
+
+        $response = $this->client->request('PROPFIND', $href, $params);
+
         $this->assertEquals(207, $response->getStatusCode());
         $data = $response->getBody();
         $this->assertStringContainsString("<d:href>$href</d:href>", $data);
@@ -171,7 +207,7 @@
      *
      * @depends testDiscoverCalendars
      */
-    public function testPropfindCalendarWithoutAuth($href)
+    public function testPropfindCalendarWithoutAuth($href): void
     {
         $body = <<<EOF
             <d:propfind xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/" xmlns:c="urn:ietf:params:xml:ns:caldav">
@@ -187,25 +223,32 @@
             </d:propfind>
         EOF;
 
-        $response = self::$client->request('PROPFIND', $href, [
+        $params = [
             'headers' => [
-                "Depth" => "0",
+                'Depth' => '0',
             ],
             'body' => $body,
-            'auth' => []
-        ]);
+            'auth' => [],
+        ];
+
+        $response = $this->client->request('PROPFIND', $href, $params);
+
         $this->assertEquals(401, $response->getStatusCode());
         $this->assertStringContainsString('Basic realm=', $response->getHeader('WWW-Authenticate')[0]);
+
         $data = $response->getBody();
-        $this->assertStringContainsString("<s:exception>Sabre\DAV\Exception\NotAuthenticated</s:exception>", $data);
+        if ($this->isCyrus) {
+            $this->assertStringContainsString("Unauthorized", $data);
+        } else {
+            $this->assertStringContainsString("<s:exception>Sabre\DAV\Exception\NotAuthenticated</s:exception>", $data);
+        }
     }
 
     /**
-    * Required for MacOS autoconfig
-    */
-    public function testOptions()
+     * Required for MacOS autoconfig
+     */
+    public function testOptions(): void
     {
-        $user = self::$user;
         $body = <<<EOF
             <d:propfind xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/" xmlns:c="urn:ietf:params:xml:ns:caldav">
                 <d:prop>
@@ -217,14 +260,17 @@
             </d:propfind>
         EOF;
 
-        $response = self::$client->request('OPTIONS', "/iRony/principals/{$user->email}/", ['body' => $body]);
+        $email = $this->user->email;
+        $href = $this->isCyrus ? "principals/user/{$email}" : "principals/{email}";
+
+        $response = $this->client->request('OPTIONS', $href, ['body' => $body]);
+
         $this->assertEquals(200, $response->getStatusCode());
         $this->assertStringContainsString('PROPFIND', $response->getHeader('Allow')[0]);
     }
 
-    public function testWellKnown()
+    public function testWellKnown(): void
     {
-        $user = self::$user;
         $body = <<<EOF
             <d:propfind xmlns:d="DAV:" xmlns:cs="http://calendarserver.org/ns/" xmlns:c="urn:ietf:params:xml:ns:caldav">
                 <d:prop>
@@ -236,52 +282,51 @@
             </d:propfind>
         EOF;
 
-        // The base URL needs to work as a redirect
-        $response = self::$client->request('PROPFIND', '/.well-known/caldav', [
+        $email = $this->user->email;
+        $path = trim(\config('services.dav.uri'), '/');
+        $baseUri = preg_replace('|/[^/]+$|', '', $path);
+        $params = [
             'headers' => [
-                "Depth" => "infinity",
+                'Depth' => 'infinity',
             ],
             'body' => $body,
-            'allow_redirects' => false
-        ]);
+            'allow_redirects' => false,
+            'base_uri' => $baseUri,
+        ];
+
+        // The base URL needs to work as a redirect
+        $response = $this->client->request('PROPFIND', "/.well-known/caldav/", $params);
         $this->assertEquals(301, $response->getStatusCode());
+
         $redirectTarget = $response->getHeader('location')[0];
-        $this->assertEquals(\config('services.dav.uri') . "iRony/", $redirectTarget);
+
+        // FIXME: Is this indeed expected?
+        $this->assertEquals($path . ($this->isCyrus ? '/calendars/user/' : '/calendars'), $redirectTarget);
 
         // Follow the redirect
-        $response = self::$client->request('PROPFIND', $redirectTarget, [
-            'headers' => [
-                "Depth" => "infinity",
-            ],
-            'body' => $body,
-            'allow_redirects' => false
-        ]);
+        $response = $this->client->request('PROPFIND', $redirectTarget, $params);
         $this->assertEquals(207, $response->getStatusCode());
 
         // Any URL should result in a redirect to the same path
-        $response = self::$client->request('PROPFIND', "/.well-known/caldav/calendars/{$user->email}", [
-            'headers' => [
-                "Depth" => "infinity",
-            ],
-            'body' => $body,
-            'allow_redirects' => false
-        ]);
+        $response = $this->client->request('PROPFIND', "/.well-known/caldav/calendars/{$email}", $params);
         $this->assertEquals(301, $response->getStatusCode());
+
         $redirectTarget = $response->getHeader('location')[0];
-        //FIXME we have an extra slash that we don't technically want here
-        $this->assertEquals(\config('services.dav.uri') . "iRony//calendars/{$user->email}", $redirectTarget);
+
+        // FIXME: This is imho not what I'd expect from Cyrus, and that location fails in the following request
+        $expected = $path . ($this->isCyrus ? "/calendars/user/calendars/{$email}" : "/calendars/{$email}");
+        $this->assertEquals($expected, $redirectTarget);
 
         // Follow the redirect
-        $response = self::$client->request('PROPFIND', $redirectTarget, [
-            'headers' => [
-                "Depth" => "infinity",
-            ],
-            'body' => $body,
-            'allow_redirects' => false
-        ]);
+        $response = $this->client->request('PROPFIND', $redirectTarget, $params);
         $this->assertEquals(207, $response->getStatusCode());
+
         $data = $response->getBody();
-        $this->assertStringContainsString("<d:href>/iRony/calendars/{$user->email}/</d:href>", $data);
+        if ($this->isCyrus) {
+            $this->assertStringContainsString("<d:href>{$this->path}/calendars/user/{$email}/</d:href>", $data);
+        } else {
+            $this->assertStringContainsString("<d:href>{$this->path}/calendars/{$email}/</d:href>", $data);
+        }
     }
 
     /**
@@ -289,6 +334,6 @@
      */
     public function testCleanup(): void
     {
-        $this->deleteTestUser(self::$user->email);
+        $this->deleteTestUser($this->user->email);
     }
 }
diff --git a/src/tests/Infrastructure/IMAPTest.php b/src/tests/Infrastructure/IMAPTest.php
--- a/src/tests/Infrastructure/IMAPTest.php
+++ b/src/tests/Infrastructure/IMAPTest.php
@@ -5,6 +5,9 @@
 use App\Backends\IMAP;
 use Tests\TestCase;
 
+/**
+ * @group imap
+ */
 class IMAPTest extends TestCase
 {
     private static ?\App\User $user = null;
diff --git a/src/tests/Infrastructure/RoundcubeTest.php b/src/tests/Infrastructure/RoundcubeTest.php
--- a/src/tests/Infrastructure/RoundcubeTest.php
+++ b/src/tests/Infrastructure/RoundcubeTest.php
@@ -34,40 +34,35 @@
     {
         $this->browse(function (Browser $browser) {
             $browser->visit('/')
-            ->type('#rcmloginuser', self::$user->email)
-            ->type('#rcmloginpwd', "simple123")
-            ->press('#rcmloginsubmit')
-            ->waitFor('#logo')
-            ->waitUntil('!rcmail.busy')
-            ->assertSee('Inbox');
+                ->type('#rcmloginuser', self::$user->email)
+                ->type('#rcmloginpwd', 'simple123')
+                ->press('#rcmloginsubmit')
+                ->waitFor('#logo')
+                ->waitUntil('!rcmail.busy')
+                ->assertSee('Inbox');
 
             $browser->press('.contacts')
-            ->waitUntil('!rcmail.busy')
-            ->assertVisible('#directorylist')
-            ->assertVisible('.addressbook.personal')
-            ->assertSee('Contacts');
+                ->waitUntil('!rcmail.busy')
+                ->assertVisible('#directorylist')
+                ->assertVisible('.addressbook.personal')
+                ->assertSee('Addressbook');
 
             $browser->press('.button-calendar')
-            ->waitUntil('!rcmail.busy')
-            ->assertSee('Calendar');
+                ->waitUntil('!rcmail.busy')
+                ->assertSee('Calendar');
 
             //TODO requires the default folders to be created
             // $browser->press('.button-files')
             // ->waitUntil('!rcmail.busy')
             // ->assertSeeIn('#files-folder-list', 'Files');
 
-            $browser->press('.button-notes')
-            ->waitUntil('!rcmail.busy')
-            ->assertSeeIn('#notebooks-content', 'Notes');
-
             $browser->press('.button-tasklist')
-            ->waitUntil('!rcmail.busy')
-            ->assertSee('Tasks');
+                ->waitUntil('!rcmail.busy')
+                ->assertSee('Calendar'); // TODO: It will be 'Tasks' at some point
 
             $browser->press('.settings')
-            ->waitUntil('!rcmail.busy')
-            ->assertSee('Activesync');
-            // print($browser->dump());
+                ->waitUntil('!rcmail.busy')
+                ->assertSee('Activesync');
         });
     }
 
diff --git a/src/tests/TestCaseTrait.php b/src/tests/TestCaseTrait.php
--- a/src/tests/TestCaseTrait.php
+++ b/src/tests/TestCaseTrait.php
@@ -571,10 +571,7 @@
      */
     protected function getTestUser($email, $attrib = [], $createInBackends = false)
     {
-        // Disable jobs (i.e. skip LDAP oprations)
-        if (!$createInBackends) {
-            Queue::fake();
-        }
+        Queue::fake();
 
         $user = User::firstOrCreate(['email' => $email], $attrib);
 
@@ -584,6 +581,11 @@
             $user = User::create(['email' => $email] + $attrib);
         }
 
+        if ($createInBackends) {
+            $job = new \App\Jobs\User\CreateJob($user->id);
+            $job->handle();
+        }
+
         return $user;
     }