diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6ae86d4f..fd138d67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ stages:
   - test
   - testall
   - testldap
+  - testldapmemcache
 
 build:
   stage: build
@@ -136,7 +137,7 @@ test_memcache:
       always
   script:
     - testing/gitlab_ci_script.sh memcache
-    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling webui ischedule memcache" ./run_regressions.sh all x'
+    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="regression-suite binding carddav scheduling webui ischedule" ./run_regressions.sh all x'
   after_script:
     - testing/gitlab_ci_after_script.sh
 
@@ -158,9 +159,9 @@ test_ldap:
   after_script:
     - testing/gitlab_ci_after_script.sh
 
-# Only test if the memcache test passes
+# Only test if the memcache and LDAP tests pass
 test_memcache_and_ldap:
-  stage: testldap
+  stage: testldapmemcache
   image: debian:unstable
   artifacts:
     paths:
@@ -174,6 +175,6 @@ test_memcache_and_ldap:
       always
   script:
     - testing/gitlab_ci_script.sh ldap_memcache_auth
-    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="ldap_memcache" ./run_regressions.sh all x'
+    - cd testing && su testrunner -c 'IS_CI=yes ALLSUITES="ldap ldap_memcache" ./run_regressions.sh all x'
   after_script:
     - testing/gitlab_ci_after_script.sh
diff --git a/testing/tests/memcache/0001-CachedCredentials.result b/testing/tests/memcache/0001-CachedCredentials.result
deleted file mode 100644
index ed16811b..00000000
--- a/testing/tests/memcache/0001-CachedCredentials.result
+++ /dev/null
@@ -1 +0,0 @@
-Cached credentials worked
diff --git a/testing/tests/memcache/0001-CachedCredentials.test b/testing/tests/memcache/0001-CachedCredentials.test
deleted file mode 100644
index e683c8e1..00000000
--- a/testing/tests/memcache/0001-CachedCredentials.test
+++ /dev/null
@@ -1,5 +0,0 @@
-# Just check to see if the log line for cached credentials being valid is
-# present. That is only issued if we're successfully fetch valid credentials
-# from our cache.
-SCRIPT=if grep -q "HTTPAuthLogin:CheckCache: Cached credentials for user1 are good and valid" /var/log/apache2/regression-error.log; then echo "Cached credentials worked"; else echo "Cached credentials failed"; fi
-
diff --git a/testing/tests/memcache/Create-Database.result b/testing/tests/memcache/Create-Database.result
deleted file mode 100644
index bf224505..00000000
--- a/testing/tests/memcache/Create-Database.result
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-Supported locales updated.
-Updated view: dav_principal.sql applied.
-CalDAV functions updated.
-RRULE functions updated.
-Database permissions updated.
-NOTE
-====
-*  The password for the 'admin' user has been set to 'nimda'
-
-Thanks for trying DAViCal! Check the configuration in /etc/davical/config.php.
-For help, look at our website and wiki, or visit #davical on irc.oftc.net.
-
diff --git a/testing/tests/memcache/Dump-Database.result b/testing/tests/memcache/Dump-Database.result
deleted file mode 100644
index e69de29b..00000000
diff --git a/testing/tests/memcache/Really-Upgrade-Database.result b/testing/tests/memcache/Really-Upgrade-Database.result
deleted file mode 100644
index 1a6af925..00000000
--- a/testing/tests/memcache/Really-Upgrade-Database.result
+++ /dev/null
@@ -1,7 +0,0 @@
-The database is version XX currently at revision 1.3.5.
-No patches were applied.
-Supported locales updated.
-Updated view: dav_principal.sql applied.
-CalDAV functions updated.
-RRULE functions updated.
-Database permissions updated.
diff --git a/testing/tests/memcache/Restore-Database.result b/testing/tests/memcache/Restore-Database.result
deleted file mode 100644
index d1fc0bfc..00000000
--- a/testing/tests/memcache/Restore-Database.result
+++ /dev/null
@@ -1,140 +0,0 @@
- set_config 
-------------
- public
-(1 row)
-
- setval 
---------
-   1000
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-     10
-(1 row)
-
- setval 
---------
-     10
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-      1
-(1 row)
-
- setval 
---------
-   1000
-(1 row)
-
diff --git a/testing/tests/memcache/Upgrade-Database.result b/testing/tests/memcache/Upgrade-Database.result
deleted file mode 100644
index a34c672b..00000000
--- a/testing/tests/memcache/Upgrade-Database.result
+++ /dev/null
@@ -1,5 +0,0 @@
-Supported locales updated.
-Updated view: dav_principal.sql applied.
-CalDAV functions updated.
-RRULE functions updated.
-Database permissions updated.