diff --git a/Makefile b/Makefile
index 45d4c67b..70e656bf 100644
--- a/Makefile
+++ b/Makefile
@@ -188,7 +188,7 @@ fixtures:
 
 	docker exec mail_override_hostname /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/existing-user1.txt"
 	# Wait for mails to be analyzed
-	sleep 40
+	sleep 60
 
 tests:
 	# Start tests
diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index 3881e1e4..0f59d301 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -1012,6 +1012,9 @@ function fix() {
 		$_func
 		[ $? != 0 ] && defunc
 	done
+
+        notify 'taskgrg' "Remove leftover pid files from a stop/start"
+        rm -rf /var/run/*.pid /var/run/*/*.pid
 }
 
 function _fix_var_mail_permissions() {