diff --git a/testing/ostest/robust.c b/testing/ostest/robust.c
index f2ed48569..9217a279f 100644
--- a/testing/ostest/robust.c
+++ b/testing/ostest/robust.c
@@ -202,6 +202,14 @@ void robust_test(void)
       nerrors++;
     }
 
+  /* Make sure waiter exit completely */
+
+  do
+    {
+      sleep(1);
+    }
+  while (kill(g_robust_mutex.pid, 0) == 0 || errno != ESRCH);
+
   /* Make the mutex consistent and try again.  It should succeed this time. */
 
   printf("robust_test: Make the mutex consistent again.\n");