diff --git a/TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp b/TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp
index ac14680d37..36269fbfb3 100644
--- a/TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp
+++ b/TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp
@@ -68,9 +68,6 @@ void example_main(void)
 
     free(response_buf);
     psa_close(conn_handle);
-
-    // Wait for psa_close to finish on server side
-    osDelay(50);
 }
 
 // --------------------------------- Test Framework ---------------------------------- */
diff --git a/TESTS/psa/spm_smoke/COMPONENT_SPE/partition1.c b/TESTS/psa/spm_smoke/COMPONENT_SPE/partition1.c
index d9f327f978..66aad3c68d 100644
--- a/TESTS/psa/spm_smoke/COMPONENT_SPE/partition1.c
+++ b/TESTS/psa/spm_smoke/COMPONENT_SPE/partition1.c
@@ -50,8 +50,6 @@ void part1_main(void *ptr)
             SPM_PANIC("Received unknown signal (0x%08x)\n", signals);
         }
 
-        osDelay(500);
-
         psa_get(ROT_SRV1_MSK, &msg);
         if (msg.handle != PSA_NULL_HANDLE) {
             client_id = msg.client_id;