diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 7590a03..7499651 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -1106,6 +1106,11 @@
         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
 }