diff --git a/php/tests/run.sh b/php/tests/run.sh
index 35859741..4abeefc1 100755
--- a/php/tests/run.sh
+++ b/php/tests/run.sh
@@ -29,9 +29,6 @@ run_tests() {
     # Clean up old containers and volumes
     $DOCO --profile $profile down -v --remove-orphans
     docker container rm --force nextcloud-aio-{mastercontainer,apache,notify-push,nextcloud,redis,database,domaincheck,whiteboard,imaginary,talk,collabora,borgbackup} > /dev/null 2>&1
-    # Wait a few seconds so that the containers are correctly removed
-    sleep 10
-    # Then remove the volumes
     docker volume rm nextcloud_aio_{mastercontainer,apache,database,database_dump,nextcloud,nextcloud_data,redis,backup_cache,elasticsearch} > /dev/null 2>&1
 
     echo -e "\n 📣  Running playwright tests for ${TESTS_FILE} with SKIP_DOMAIN_VALIDATION=$SKIP_DOMAIN_VALIDATION and profile '$profile'\n"
@@ -39,7 +36,7 @@ run_tests() {
     exitcode=$?
     if test $exitcode -gt 0; then
         for container in nextcloud-aio-{mastercontainer,borgbackup,desec-mock}; do
-            if docker container list --format="{{ .Names }}" | grep -q "$container"; then
+            if docker container list -a --format="{{ .Names }}" | grep -q "$container"; then
                 echo -e "\n 📣  Log output from container ${container}:\n"
                 docker logs "$container"
             fi