--- jsr166/src/test/tck/ForkJoinTask8Test.java	2015/01/15 18:34:19	1.8
+++ jsr166/src/test/tck/ForkJoinTask8Test.java	2015/02/07 17:43:38	1.9
@@ -729,10 +729,13 @@ public class ForkJoinTask8Test extends J
                 AsyncFib f = new AsyncFib(8);
                 AsyncFib g = new AsyncFib(9);
                 AsyncFib h = null;
-                try {
-                    invokeAll(f, g, h);
-                    shouldThrow();
-                } catch (NullPointerException success) {}
+                Runnable[] throwingActions = {
+                    () -> invokeAll(h),
+                    () -> invokeAll(f, g, h),
+                    () -> invokeAll(f, h, g),
+                    () -> invokeAll(h, f, g),
+                };
+                assertThrows(NullPointerException.class, throwingActions);
             }};
         testInvokeOnPool(mainPool(), a);
     }