Index: tests/concurrent/waitfor/when.cfa
===================================================================
--- tests/concurrent/waitfor/when.cfa	(revision cca568e32a0a35aff9eb80fa5e403e3d338d349e)
+++ tests/concurrent/waitfor/when.cfa	(revision b7d6a36126af369a09bd3958b2fe17c537999f77)
@@ -57,4 +57,8 @@
 
 void arbiter( global_t & mutex this ) {
+	// There is a race at start where callers can get in before the arbiter.
+	// It doesn't really matter here so just restart the loop correctly and move on
+	this.last_call = 6;
+
 	for( int i = 0; i < N; i++ ) {
 		   when( this.last_call == 6 ) waitfor( call1 : this ) { if( this.last_call != 1) { serr | "Expected last_call to be 1 got" | this.last_call; } }