--- jsr166/src/test/tck/CompletableFutureTest.java	2015/09/10 17:51:37	1.124
+++ jsr166/src/test/tck/CompletableFutureTest.java	2015/10/02 21:08:48	1.126
@@ -898,7 +898,7 @@ public class CompletableFutureTest exten
      * whenComplete action executes on normal completion, propagating
      * source result.
      */
-    public void testWhenComplete_normalCompletion1() {
+    public void testWhenComplete_normalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
         for (Integer v1 : new Integer[] { 1, null })
@@ -3708,9 +3708,7 @@ public class CompletableFutureTest exten
             (method) -> (method.getModifiers() & Modifier.STATIC) == 0;
         List<Method> minimalMethods =
             Stream.of(Object.class, CompletionStage.class)
-            .map((klazz) -> Stream.of(klazz.getMethods()))
-            .reduce(Stream::concat)
-            .orElseGet(Stream::empty)
+            .flatMap((klazz) -> Stream.of(klazz.getMethods()))
             .filter(isNotStatic)
             .collect(Collectors.toList());
         // Methods from CompletableFuture permitted NOT to throw UOE