--- jsr166/src/test/tck/CompletableFutureTest.java	2016/03/29 04:42:54	1.141
+++ jsr166/src/test/tck/CompletableFutureTest.java	2016/04/01 23:18:00	1.142
@@ -640,8 +640,12 @@ public class CompletableFutureTest exten
 
         ASYNC {
             public void checkExecutionMode() {
-                assertEquals(defaultExecutorIsCommonPool,
-                             (ForkJoinPool.commonPool() == ForkJoinTask.getPool()));
+                // If tests are added that may run across different
+                // pools, this needs to be weakened to no-op.
+                ForkJoinPool p = ForkJoinTask.getPool();
+                assertTrue(p == null ||
+                           (defaultExecutorIsCommonPool &&
+                            p == ForkJoinPool.commonPool()));
             }
             public CompletableFuture<Void> runAsync(Runnable a) {
                 return CompletableFuture.runAsync(a);