--- jsr166/src/test/tck/DelayQueueTest.java	2017/05/13 21:43:50	1.83
+++ jsr166/src/test/tck/DelayQueueTest.java	2017/05/13 22:49:01	1.85
@@ -432,7 +432,7 @@ public class DelayQueueTest extends JSR1
             }});
 
         await(pleaseInterrupt);
-        assertThreadStaysAlive(t);
+        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
         t.interrupt();
         awaitTermination(t);
         checkEmpty(q);
@@ -713,7 +713,9 @@ public class DelayQueueTest extends JSR1
     public void testTimedPollDelayed() throws InterruptedException {
         DelayQueue q = new DelayQueue();
         q.add(new NanoDelay(LONG_DELAY_MS * 1000000L));
+        long startTime = System.nanoTime();
         assertNull(q.poll(timeoutMillis(), MILLISECONDS));
+        assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
     }
 
     /**