--- jsr166/src/test/tck/ArrayBlockingQueueTest.java	2015/10/04 18:49:02	1.68
+++ jsr166/src/test/tck/ArrayBlockingQueueTest.java	2015/10/05 23:06:12	1.69
@@ -452,24 +452,24 @@ public class ArrayBlockingQueueTest exte
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
                 for (int i = 0; i < SIZE; ++i) {
-                    long t0 = System.nanoTime();
-                    assertEquals(i, (int) q.poll(LONG_DELAY_MS, MILLISECONDS));
-                    assertTrue(millisElapsedSince(t0) < SMALL_DELAY_MS);
+                    long startTime = System.nanoTime();
+                    assertEquals(i, (int) q.poll(2*LONG_DELAY_MS, MILLISECONDS));
+                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
                 }
-                long t0 = System.nanoTime();
+                long startTime = System.nanoTime();
                 aboutToWait.countDown();
                 try {
-                    q.poll(MEDIUM_DELAY_MS, MILLISECONDS);
+                    q.poll(2*LONG_DELAY_MS, MILLISECONDS);
                     shouldThrow();
                 } catch (InterruptedException success) {
-                    assertTrue(millisElapsedSince(t0) < MEDIUM_DELAY_MS);
+                    assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
                 }
             }});
 
-        aboutToWait.await();
-        waitForThreadToEnterWaitState(t, SMALL_DELAY_MS);
+        await(aboutToWait);
+        waitForThreadToEnterWaitState(t, LONG_DELAY_MS);
         t.interrupt();
-        awaitTermination(t, MEDIUM_DELAY_MS);
+        awaitTermination(t, LONG_DELAY_MS);
         checkEmpty(q);
     }