diff --git a/testsuites/validation/tr-tq-surrender-priority-inherit.c b/testsuites/validation/tr-tq-surrender-priority-inherit.c
index d0a580f988..10d572207a 100644
--- a/testsuites/validation/tr-tq-surrender-priority-inherit.c
+++ b/testsuites/validation/tr-tq-surrender-priority-inherit.c
@@ -537,11 +537,15 @@ static void Cleanup( Context *ctx )
   TQWaitForExecutionStop( ctx->tq_ctx, NEW_OWNER );
 
 #if defined(RTEMS_SMP)
-  TQSendAndWaitForExecutionStop(
+  TQSendAndSynchronizeRunner(
     ctx->tq_ctx,
     NEW_OWNER,
     TQ_EVENT_MUTEX_B_RELEASE
   );
+  TQWaitForExecutionStop(
+    ctx->tq_ctx,
+    NEW_OWNER
+  );
 
   if ( ctx->gains_new_priority ) {
     TQSendAndSynchronizeRunner(