--- jsr166/src/test/tck/BlockingQueueTest.java	2015/10/08 00:41:57	1.17
+++ jsr166/src/test/tck/BlockingQueueTest.java	2017/05/13 21:43:50	1.18
@@ -267,7 +267,7 @@ public abstract class BlockingQueueTest
             }});
 
         await(threadStarted);
-        assertThreadStaysAlive(t);
+        assertThreadBlocks(t, Thread.State.WAITING);
         t.interrupt();
         awaitTermination(t);
     }
@@ -308,7 +308,7 @@ public abstract class BlockingQueueTest
             }});
 
         await(threadStarted);
-        assertThreadStaysAlive(t);
+        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
         t.interrupt();
         awaitTermination(t);
     }