--- jsr166/src/test/tck/CountedCompleterTest.java	2017/05/29 19:15:02	1.33
+++ jsr166/src/test/tck/CountedCompleterTest.java	2017/10/26 22:50:07	1.35
@@ -111,7 +111,7 @@ public class CountedCompleterTest extend
         try {
             assertNull(a.get());
             assertNull(a.get(randomTimeout(), randomTimeUnit()));
-        } catch (Throwable fail) { threadUnexpectedException(fail); }
+        } catch (Exception fail) { threadUnexpectedException(fail); }
     }
 
     void checkCancelled(CountedCompleter a) {
@@ -731,6 +731,8 @@ public class CountedCompleterTest extend
                 CCF f = new LCCF(8);
                 assertSame(f, f.fork());
                 helpQuiesce();
+                while (!f.isDone()) // wait out race
+                    ;
                 assertEquals(21, f.number);
                 assertEquals(0, getQueuedTaskCount());
                 checkCompletedNormally(f);