--- jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2015/02/22 04:34:44	1.49
+++ jsr166/src/test/tck/AbstractQueuedSynchronizerTest.java	2015/07/03 01:56:38	1.51
@@ -21,7 +21,7 @@ import junit.framework.TestSuite;
 
 public class AbstractQueuedSynchronizerTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(AbstractQueuedSynchronizerTest.class);
@@ -249,6 +249,7 @@ public class AbstractQueuedSynchronizerT
                 long nanosTimeout = MILLISECONDS.toNanos(timeoutMillis);
                 long nanosRemaining = c.awaitNanos(nanosTimeout);
                 assertTrue(nanosRemaining <= 0);
+                assertTrue(nanosRemaining > -MILLISECONDS.toNanos(LONG_DELAY_MS));
                 break;
             case awaitUntil:
                 assertFalse(c.awaitUntil(delayedDate(timeoutMillis)));