diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 6330d4f881d..9e9b122c5fe 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -5191,7 +5191,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 (wait_until_dead(pid, timeout < 5 ? 5 : timeout))
     {
       (void) my_kill(pid, SIGKILL);
     }