diff --git a/kernel/src/thread/Scheduler.cpp b/kernel/src/thread/Scheduler.cpp
index e6acc9dc..f41333a4 100644
--- a/kernel/src/thread/Scheduler.cpp
+++ b/kernel/src/thread/Scheduler.cpp
@@ -279,7 +279,14 @@ void sched_common_exit(Context* context, int64_t status)
             return true;
         });
     }
-    else { reboot(); }
+    else
+    {
+#ifndef RUN_TEST_AS_INIT
+        reboot();
+#else
+        hang();
+#endif
+    }
     Scheduler::task_yield(context);
 }