--- jsr166/src/test/tck/CompletableFutureTest.java	2015/09/04 19:59:18	1.114
+++ jsr166/src/test/tck/CompletableFutureTest.java	2015/09/05 15:35:47	1.117
@@ -3345,6 +3345,13 @@ public class CompletableFutureTest exten
             () -> CompletableFuture.anyOf(null, f),
 
             () -> f.obtrudeException(null),
+
+            () -> CompletableFuture.delayedExecutor(1L, SECONDS, null),
+            () -> CompletableFuture.delayedExecutor(1L, null, new ThreadExecutor()),
+            () -> CompletableFuture.delayedExecutor(1L, null),
+
+            () -> f.orTimeout(1L, null),
+            () -> f.completeOnTimeout(42, 1L, null),
         };
 
         assertThrows(NullPointerException.class, throwingActions);
@@ -3365,11 +3372,19 @@ public class CompletableFutureTest exten
      * newIncompleteFuture returns an incomplete CompletableFuture
      */
     public void testNewIncompleteFuture() {
+        for (Integer v1 : new Integer[] { 1, null })
+    {
         CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = f.newIncompleteFuture();
         checkIncomplete(f);
         checkIncomplete(g);
-    }
+        f.complete(v1);
+        checkCompletedNormally(f, v1);
+        checkIncomplete(g);
+        g.complete(v1);
+        checkCompletedNormally(g, v1);
+        assertSame(g.getClass(), CompletableFuture.class);
+    }}
 
     /**
      * completedStage returns a completed CompletionStage