Index: tests/concurrency/waituntil/repeat_close.cfa
===================================================================
--- tests/concurrency/waituntil/repeat_close.cfa	(revision 5adb277d01783b004e95ea3f76e807d20736bf78)
+++ tests/concurrency/waituntil/repeat_close.cfa	(revision a1467c15bcdb30eb56f4f77b0df0290b9011744a)
@@ -31,10 +31,10 @@
     try {
         for( ;; ) {
-            waituntil( (in << F) ) { F_removes++; }
-            or waituntil( (in << E) ) { E_removes++; }
-            or waituntil( (in << D) ) { D_removes++; }
-            or waituntil( (in << C) ) { C_removes++; }
-            or waituntil( (in << B) ) { B_removes++; }
-            or waituntil( (in << A) ) { A_removes++; }
+            waituntil( remove(F) ) { F_removes++; }
+            or waituntil( remove(E) ) { E_removes++; }
+            or waituntil( remove(D) ) { D_removes++; }
+            or waituntil( remove(C) ) { C_removes++; }
+            or waituntil( remove(B) ) { B_removes++; }
+            or waituntil( remove(A) ) { A_removes++; }
         }
     } catchResume ( channel_closed * e ) { } // continue to remove until would block
Index: tests/concurrency/waituntil/timeout.cfa
===================================================================
--- tests/concurrency/waituntil/timeout.cfa	(revision 5adb277d01783b004e95ea3f76e807d20736bf78)
+++ tests/concurrency/waituntil/timeout.cfa	(revision a1467c15bcdb30eb56f4f77b0df0290b9011744a)
@@ -15,4 +15,5 @@
 
     assert( count == 1000 );
+    sleep( 1`ms );
     printf("done\n");
 }