diff --git a/testdata/cluster/node_templates/common/etc/init.d/common.tmpl b/testdata/cluster/node_templates/common/etc/init.d/common.tmpl
index 51197c5..525ffdb 100644
--- a/testdata/cluster/node_templates/common/etc/init.d/common.tmpl
+++ b/testdata/cluster/node_templates/common/etc/init.d/common.tmpl
@@ -80,6 +80,8 @@
   local DEADLINE=$(($(date +%s) + $TIMEOUT_SECS))
   while [[ $(date +%s) -lt $DEADLINE ]]; do
     if ! pid_exists $PID; then
+      # Remove the pid file so that there is no confusion if the pids wrap
+      rm -f $PID_FILE
       return
     fi
     sleep 0.1