--- jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2017/01/04 06:09:58	1.97
+++ jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2017/03/25 21:41:10	1.98
@@ -238,7 +238,7 @@ public class ThreadPoolExecutorSubclassT
             final Runnable task = new CheckedRunnable() {
                 public void realRun() { done.countDown(); }};
             p.execute(task);
-            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
+            await(done);
         }
     }
 
@@ -332,13 +332,13 @@ public class ThreadPoolExecutorSubclassT
                 public void realRun() throws InterruptedException {
                     threadStarted.countDown();
                     assertEquals(0, p.getCompletedTaskCount());
-                    threadProceed.await();
+                    await(threadProceed);
                     threadDone.countDown();
                 }});
             await(threadStarted);
             assertEquals(0, p.getCompletedTaskCount());
             threadProceed.countDown();
-            threadDone.await();
+            await(threadDone);
             long startTime = System.nanoTime();
             while (p.getCompletedTaskCount() != 1) {
                 if (millisElapsedSince(startTime) > LONG_DELAY_MS)
@@ -1926,7 +1926,7 @@ public class ThreadPoolExecutorSubclassT
                     public void realRun() {
                         done.countDown();
                     }});
-            assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
+            await(done);
         }
     }