diff --git a/tests_psa_arch/CMakeLists.txt b/tests_psa_arch/CMakeLists.txt
index 948df86..13c3241 100644
--- a/tests_psa_arch/CMakeLists.txt
+++ b/tests_psa_arch/CMakeLists.txt
@@ -120,6 +120,7 @@
 
 target_link_libraries(tfm_ns
     PRIVATE
+        os_wrapper
         tfm_test_broker
         val_nspe
         pal_nspe
diff --git a/tests_psa_arch/test_app.c b/tests_psa_arch/test_app.c
index 80190bd..74f98ec 100644
--- a/tests_psa_arch/test_app.c
+++ b/tests_psa_arch/test_app.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2023, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -7,6 +7,7 @@
 
 #include "test_app.h"
 #include "tfm_log.h"
+#include "os_wrapper/thread.h"
 
 /**
  * \brief This symbol is the entry point provided by the PSA API compliance
@@ -29,6 +30,5 @@
     LOG_MSG("\x04");
 
     /* End of test */
-    for (;;) {
-    }
+    os_wrapper_thread_exit();
 }