--- jsr166/src/test/tck/CompletableFutureTest.java	2017/03/18 20:42:20	1.184
+++ jsr166/src/test/tck/CompletableFutureTest.java	2017/05/29 19:15:02	1.185
@@ -64,7 +64,7 @@ public class CompletableFutureTest exten
             assertNull(f.getNow(null));
         } catch (Throwable fail) { threadUnexpectedException(fail); }
         try {
-            f.get(0L, SECONDS);
+            f.get(randomExpiredTimeout(), randomTimeUnit());
             shouldThrow();
         }
         catch (TimeoutException success) {}
@@ -76,11 +76,7 @@ public class CompletableFutureTest exten
 
         try {
             assertEquals(value, f.join());
-        } catch (Throwable fail) { threadUnexpectedException(fail); }
-        try {
             assertEquals(value, f.getNow(null));
-        } catch (Throwable fail) { threadUnexpectedException(fail); }
-        try {
             assertEquals(value, f.get());
         } catch (Throwable fail) { threadUnexpectedException(fail); }
         assertTrue(f.isDone());