diff --git a/test/emu/nanos6/nested-tasks.c b/test/emu/nanos6/nested-tasks.c
index 7b49a3b..6621f3f 100644
--- a/test/emu/nanos6/nested-tasks.c
+++ b/test/emu/nanos6/nested-tasks.c
@@ -30,13 +30,17 @@ main(void)
 	/* Create and run the tasks, one nested into another */
 	for(int i = 0; i < ntasks; i++)
 	{
+		instr_nanos6_handle_task_enter();
 		instr_nanos6_task_create_and_execute(i + 1, typeid);
 		usleep(500);
 	}
 
 	/* End the tasks in the opposite order */
 	for(int i = ntasks - 1; i >= 0; i--)
+	{
 		instr_nanos6_task_end(i + 1);
+		instr_nanos6_handle_task_exit();
+	}
 
 	instr_end();