--- jsr166/src/test/tck/ReentrantReadWriteLockTest.java	2015/07/03 00:23:43	1.75
+++ jsr166/src/test/tck/ReentrantReadWriteLockTest.java	2015/07/03 01:25:15	1.77
@@ -170,7 +170,7 @@ public class ReentrantReadWriteLockTest
         case awaitNanos:
             long timeoutNanos = MILLISECONDS.toNanos(timeoutMillis);
             long nanosRemaining = c.awaitNanos(timeoutNanos);
-            assertTrue(nanosRemaining > 0);
+            assertTrue(nanosRemaining > timeoutNanos / 2);
             assertTrue(nanosRemaining <= timeoutNanos);
             break;
         case awaitUntil:
@@ -970,10 +970,8 @@ public class ReentrantReadWriteLockTest
             final Condition c = lock.writeLock().newCondition();
             lock.writeLock().lock();
             long startTime = System.nanoTime();
-            long timeoutMillis = 10;
-            java.util.Date d = new java.util.Date();
-            assertFalse(c.awaitUntil(new java.util.Date(d.getTime() + timeoutMillis)));
-            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
+            assertFalse(c.awaitUntil(delayedDate(timeoutMillis())));
+            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
             lock.writeLock().unlock();
         } catch (InterruptedException fail) { threadUnexpectedException(fail); }
     }