diff --git a/tftf/tests/common/test_helpers.c b/tftf/tests/common/test_helpers.c
index bd82fd9..46a376f 100644
--- a/tftf/tests/common/test_helpers.c
+++ b/tftf/tests/common/test_helpers.c
@@ -191,6 +191,7 @@
 		tftf_init_event(&cpu_done[i]);
 	}
 
+	 /* Power on each secondary CPU one after the other. */
 	for_each_cpu(cpu_node) {
 		mpidr = tftf_get_mpidr_from_node(cpu_node);
 		if (mpidr == lead_mpid) {
@@ -202,16 +203,8 @@
 			ERROR("tftf_cpu_on mpidr 0x%x returns %d\n",
 			      mpidr, ret);
 		}
-	}
 
-	VERBOSE("Waiting secondary CPUs to turn off ...\n");
-
-	for_each_cpu(cpu_node) {
-		mpidr = tftf_get_mpidr_from_node(cpu_node);
-		if (mpidr == lead_mpid) {
-			continue;
-		}
-
+		/* Wait for the secondary CPU to be ready. */
 		core_pos = platform_get_core_pos(mpidr);
 		tftf_wait_for_event(&cpu_done[core_pos]);
 	}