diff --git a/tests/runtests.pl b/tests/runtests.pl
index 2b74f6b47ad23cbad9e5cd852f714983cbed5fe3..d08e177148e1dab409b904a975ca79d7233d7ac8 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -632,9 +632,9 @@ sub stopserver {
     foreach my $server (@killservers) {
         if($run{$server}) {
             $pidlist .= "$run{$server} ";
-            $runcert{$server} = 0;
             $run{$server} = 0;
         }
+        $runcert{$server} = 0 if($runcert{$server});
     }
     killpid($verbose, $pidlist);
     #
@@ -2542,9 +2542,9 @@ sub singletest {
         foreach my $server (@killservers) {
             if($run{$server}) {
                 $pidlist .= "$run{$server} ";
-                $runcert{$server} = 0;
                 $run{$server} = 0;
             }
+            $runcert{$server} = 0 if($runcert{$server});
         }
         killpid($verbose, $pidlist);
         #
@@ -2920,9 +2920,9 @@ sub stopservers {
                 }
             }
             $pidlist .= "$run{$server} ";
-            $runcert{$server} = 0;
             $run{$server} = 0;
         }
+        $runcert{$server} = 0 if($runcert{$server});
     }
     killpid($verbose, $pidlist);
     #