--- jsr166/src/test/tck/CompletableFutureTest.java	2015/09/05 15:35:47	1.117
+++ jsr166/src/test/tck/CompletableFutureTest.java	2015/09/06 16:31:46	1.119
@@ -3419,13 +3419,13 @@ public class CompletableFutureTest exten
     public void testFailedFuture() {
         CFException ex = new CFException();
         CompletableFuture<Integer> f = CompletableFuture.failedFuture(ex);
-        checkCompletedExceptionallyWithRootCause(f, ex);
+        checkCompletedExceptionally(f, ex);
     }
 
     /**
      * failedFuture(null) throws NPE
      */
-    public void testFailedFuture2() {
+    public void testFailedFuture_null() {
         try {
             CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
             shouldThrow();
@@ -3507,7 +3507,7 @@ public class CompletableFutureTest exten
         AtomicReference<Throwable> r = new AtomicReference<Throwable>();
         f.whenComplete((v, e) -> {if (e != null) r.set(e); else x.set(v);});
         assertEquals(x.get(), 0);
-        assertEquals(r.get().getCause(), ex);
+        assertEquals(r.get(), ex);
     }
 
     /**