--- jsr166/src/test/tck/DelayQueueTest.java	2011/05/27 20:07:24	1.50
+++ jsr166/src/test/tck/DelayQueueTest.java	2011/05/28 12:45:38	1.51
@@ -462,9 +462,14 @@ public class DelayQueueTest extends JSR1
     public void testTimedPoll() throws InterruptedException {
         DelayQueue q = populatedQueue(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(new PDelay(i), ((PDelay)q.poll(SHORT_DELAY_MS, MILLISECONDS)));
+            long startTime = System.nanoTime();
+            assertEquals(new PDelay(i), ((PDelay)q.poll(LONG_DELAY_MS, MILLISECONDS)));
+            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
         }
-        assertNull(q.poll(SHORT_DELAY_MS, MILLISECONDS));
+        long startTime = System.nanoTime();
+        assertNull(q.poll(timeoutMillis(), MILLISECONDS));
+        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
+        checkEmpty(q);
     }
 
     /**