--- a/jdk/test/java/util/concurrent/tck/LinkedBlockingQueueTest.java	Mon Aug 15 09:13:22 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/LinkedBlockingQueueTest.java	Mon Aug 15 09:16:31 2016 -0700
@@ -481,7 +481,7 @@
             }});
 
         await(aboutToWait);
-        waitForThreadToEnterWaitState(t, LONG_DELAY_MS);
+        waitForThreadToEnterWaitState(t);
         t.interrupt();
         awaitTermination(t);
         checkEmpty(q);