--- jsr166/src/test/tck/LinkedTransferQueueTest.java	2017/03/18 20:42:20	1.71
+++ jsr166/src/test/tck/LinkedTransferQueueTest.java	2017/05/13 23:50:00	1.75
@@ -209,9 +209,7 @@ public class LinkedTransferQueueTest ext
         final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
         Thread t = newStartedThread(new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                for (int i = 0; i < SIZE; ++i) {
-                    assertEquals(i, q.take());
-                }
+                for (int i = 0; i < SIZE; i++) assertEquals(i, q.take());
 
                 Thread.currentThread().interrupt();
                 try {
@@ -229,7 +227,7 @@ public class LinkedTransferQueueTest ext
             }});
 
         await(pleaseInterrupt);
-        assertThreadStaysAlive(t);
+        assertThreadBlocks(t, Thread.State.WAITING);
         t.interrupt();
         awaitTermination(t);
     }
@@ -294,8 +292,8 @@ public class LinkedTransferQueueTest ext
                 assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
             }});
 
-        aboutToWait.await();
-        waitForThreadToEnterWaitState(t);
+        await(aboutToWait);
+        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
         t.interrupt();
         awaitTermination(t);
         checkEmpty(q);
@@ -963,7 +961,7 @@ public class LinkedTransferQueueTest ext
             }});
 
         await(pleaseInterrupt);
-        assertThreadStaysAlive(t);
+        assertThreadBlocks(t, Thread.State.TIMED_WAITING);
         t.interrupt();
         awaitTermination(t);
         checkEmpty(q);