diff --git a/tools/unit-test-app/components/unity/include/unity_config.h b/tools/unit-test-app/components/unity/include/unity_config.h
index 90be3a90fd..2929eb6e39 100644
--- a/tools/unit-test-app/components/unity/include/unity_config.h
+++ b/tools/unit-test-app/components/unity/include/unity_config.h
@@ -39,7 +39,7 @@ struct test_desc_t
 
 void unity_testcase_register(struct test_desc_t* desc);
 
-void unity_run_menu();
+void unity_run_menu() __attribute__((noreturn));
 
 void unity_run_tests_with_filter(const char* filter);
 
diff --git a/tools/unit-test-app/main/app_main.c b/tools/unit-test-app/main/app_main.c
index bf54b03957..b3d249fc50 100644
--- a/tools/unit-test-app/main/app_main.c
+++ b/tools/unit-test-app/main/app_main.c
@@ -6,9 +6,8 @@
 
 void unityTask(void *pvParameters)
 {
-    vTaskDelay(1000 / portTICK_PERIOD_MS);
-    unity_run_menu();
-    while(1);
+    vTaskDelay(30); /* Delay a bit to let the main task be deleted */
+    unity_run_menu(); /* Doesn't return */
 }
 
 void app_main()