--- jsr166/src/test/tck/ScheduledExecutorSubclassTest.java	2015/10/06 05:22:25	1.53
+++ jsr166/src/test/tck/ScheduledExecutorSubclassTest.java	2015/10/06 05:30:44	1.54
@@ -587,7 +587,7 @@ public class ScheduledExecutorSubclassTe
                     threadStarted.countDown();
                     await(done);
                 }});
-            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(threadStarted);
             assertFalse(p.isTerminating());
             done.countDown();
             try { p.shutdown(); } catch (SecurityException ok) { return; }
@@ -614,7 +614,7 @@ public class ScheduledExecutorSubclassTe
                     }};
                 tasks[i] = p.schedule(r, 1, MILLISECONDS);
             }
-            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(threadStarted);
             BlockingQueue<Runnable> q = p.getQueue();
             assertTrue(q.contains(tasks[tasks.length - 1]));
             assertFalse(q.contains(tasks[0]));
@@ -639,7 +639,7 @@ public class ScheduledExecutorSubclassTe
                     }};
                 tasks[i] = p.schedule(r, 1, MILLISECONDS);
             }
-            assertTrue(threadStarted.await(LONG_DELAY_MS, MILLISECONDS));
+            await(threadStarted);
             BlockingQueue<Runnable> q = p.getQueue();
             assertFalse(p.remove((Runnable)tasks[0]));
             assertTrue(q.contains((Runnable)tasks[4]));