diff --git a/examples/server/tests/features/environment.py b/examples/server/tests/features/environment.py
index c25b75cf7..cae6ea8bd 100644
--- a/examples/server/tests/features/environment.py
+++ b/examples/server/tests/features/environment.py
@@ -1,4 +1,8 @@
+import time
+
 
 def after_scenario(context, scenario):
     print("stopping server...")
     context.server_process.kill()
+    # Wait few for socket to be free up
+    time.sleep(0.05)
diff --git a/examples/server/tests/features/security.feature b/examples/server/tests/features/security.feature
index 2bfcf956a..dc96c865a 100644
--- a/examples/server/tests/features/security.feature
+++ b/examples/server/tests/features/security.feature
@@ -6,6 +6,7 @@ Feature: Security
     And   a model file stories260K.gguf
     And   a server api key llama.cpp
     Then  the server is starting
+    Then  the server is healthy
 
   Scenario Outline: Completion with some user api key
     Given a prompt test
diff --git a/examples/server/tests/tests.sh b/examples/server/tests/tests.sh
index ff3e94306..7d43ddfc8 100755
--- a/examples/server/tests/tests.sh
+++ b/examples/server/tests/tests.sh
@@ -1,11 +1,5 @@
 #!/bin/bash
 
-# kill any dandling server at the end
-cleanup() {
-    pkill -P $$
-}
-trap cleanup EXIT
-
 set -eu
 
 # Start @llama.cpp scenario