diff --git a/extras/smoke-test.sh b/extras/smoke-test.sh
index f03edea4f6192..15bcd6b1984fa 100644
--- a/extras/smoke-test.sh
+++ b/extras/smoke-test.sh
@@ -22,6 +22,7 @@ function wait_for(){
         max_retries=$((max_retries-1))
         if [[ max_retries -le 0 ]]; then
             echo "Timed out waiting for $name server" >&2
+            kill -9 ${server_pid}
             exit 1
         fi
     done