--- jsr166/src/test/tck/ScheduledExecutorTest.java	2017/03/29 17:47:16	1.92
+++ jsr166/src/test/tck/ScheduledExecutorTest.java	2017/05/29 19:15:03	1.93
@@ -73,7 +73,7 @@ public class ScheduledExecutorTest exten
             Future f = p.schedule(task, timeoutMillis(), MILLISECONDS);
             assertSame(Boolean.TRUE, f.get());
             assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
-            assertTrue(done.await(0L, MILLISECONDS));
+            assertEquals(0L, done.getCount());
         }
     }
 
@@ -241,8 +241,8 @@ public class ScheduledExecutorTest exten
         final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
         try (PoolCleaner cleaner = cleaner(p)) {
             try {
-                TrackedCallable callable = null;
-                Future f = p.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
+                Future f = p.schedule((Callable)null,
+                                      randomTimeout(), randomTimeUnit());
                 shouldThrow();
             } catch (NullPointerException success) {}
         }