diff --git a/tests/psa-client-server/psasim/test/kill_server.sh b/tests/psa-client-server/psasim/test/kill_server.sh
index b6c4f6843e..e84fd39ea1 100755
--- a/tests/psa-client-server/psasim/test/kill_server.sh
+++ b/tests/psa-client-server/psasim/test/kill_server.sh
@@ -7,11 +7,6 @@ set -e
 
 pkill psa_server || true
 
-# Remove temporary files and logs
-rm -f psa_notify_*
-rm -f psa_service_*
-rm -f psa_server.log
-
 # Remove all IPCs
 # Not just ipcrm -all=msg as it is not supported on macOS.
 # Filter out header and empty lines, choosing to select based on keys being
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 7590a037bf..7499651e7f 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -1106,6 +1106,11 @@ helper_psasim_server() {
         cd tests
         msg "terminate server and cleanup"
         psa-client-server/psasim//test/kill_server.sh
+
+        # Remove temporary files and logs
+        rm -f psa_notify_*
+        rm -f psa_service_*
+        rm -f psa_server.log
     )
     fi
 }