--- jsr166/src/test/tck/CompletableFutureTest.java	2015/09/03 11:45:34	1.103
+++ jsr166/src/test/tck/CompletableFutureTest.java	2015/09/03 16:30:05	1.105
@@ -3359,7 +3359,7 @@ public class CompletableFutureTest exten
     }
 
     // jdk9
-    
+
     /**
      * newIncompleteFuture returns an incomplete CompletableFuture
      */
@@ -3390,7 +3390,7 @@ public class CompletableFutureTest exten
         CompletableFuture<Integer> f = new CompletableFuture<>();
         Executor e = f.defaultExecutor();
         Executor c =  ForkJoinPool.commonPool();
-        if (ForkJoinPool.getCommonPoolParallelism() > 0)
+        if (ForkJoinPool.getCommonPoolParallelism() > 1)
             assertSame(e, c);
     }
 
@@ -3410,8 +3410,8 @@ public class CompletableFutureTest exten
     public void testFailedFuture2() {
         try {
             CompletableFuture<Integer> f = CompletableFuture.failedFuture(null);
-        } catch(NullPointerException success) {
-        }
+            shouldThrow();
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -3512,8 +3512,7 @@ public class CompletableFutureTest exten
         try {
             f.join();
             shouldThrow();
-        } catch(Exception success) {
-        }
+        } catch (Exception success) {}
         checkCompletedWithWrappedCFException(f);
     }
 
@@ -3538,8 +3537,7 @@ public class CompletableFutureTest exten
         try {
             f.join();
             shouldThrow();
-        } catch(Exception success) {
-        }
+        } catch (Exception success) {}
         checkCompletedWithWrappedCFException(f);
     }