diff --git a/client/mysqltest.cc b/client/mysqltest.cc

index 417d3615995..48b8f132eb2 100644

--- a/client/mysqltest.cc

+++ b/client/mysqltest.cc

@@ -5141,7 +5141,7 @@ void do_shutdown_server(struct st_command *command)

     if (timeout)

       (void) my_kill(pid, SIGABRT);

     /* Give server a few seconds to die in all cases */

-    if (!timeout || wait_until_dead(pid, timeout < 5 ? 5 : timeout))

+    if (!timeout || wait_until_dead(pid, timeout < 60 ? 60 : timeout))

     {

       (void) my_kill(pid, SIGKILL);

     }

diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc

index 4d0d1e2a3a0..abc167a4300 100644

--- a/mysql-test/lib/My/SafeProcess/safe_process.cc

+++ b/mysql-test/lib/My/SafeProcess/safe_process.cc

@@ -144,7 +144,7 @@ static int kill_child(bool was_killed)

   message("Killing child: %d", child_pid);

   // Terminate whole process group

   if (! was_killed)

-    kill(-child_pid, SIGKILL);

+    kill(-child_pid, SIGABRT);

   pid_t ret_pid= waitpid(child_pid, &status, 0);

   if (ret_pid == child_pid)

diff --git a/mysql-test/lib/v1/mtr_process.pl b/mysql-test/lib/v1/mtr_process.pl

index fd9f3817699..ee9a370c467 100644

--- a/mysql-test/lib/v1/mtr_process.pl

+++ b/mysql-test/lib/v1/mtr_process.pl

@@ -456,8 +456,8 @@ sub mtr_kill_leftovers () {

         my $retries= 10;                    # 10 seconds

         do

         {

-          mtr_debug("Sending SIGKILL to pids: " . join(' ', @pids));

-          kill(9, @pids);

+          mtr_debug("Sending SIGABRT to pids: " . join(' ', @pids));

+          kill(6, @pids);

           mtr_report("Sleep 1 second waiting for processes to die");

           sleep(1)                      # Wait one second

         } while ( $retries-- and  kill(0, @pids) );