--- jsr166/src/test/tck/ForkJoinTaskTest.java	2014/12/31 19:05:42	1.40
+++ jsr166/src/test/tck/ForkJoinTaskTest.java	2015/10/04 16:14:48	1.42
@@ -22,7 +22,7 @@ import junit.framework.TestSuite;
 public class ForkJoinTaskTest extends JSR166TestCase {
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
 
     public static Test suite() {
@@ -48,7 +48,7 @@ public class ForkJoinTaskTest extends JS
     }
 
     private void testInvokeOnPool(ForkJoinPool pool, RecursiveAction a) {
-        try {
+        try (PoolCleaner cleaner = cleaner(pool)) {
             assertFalse(a.isDone());
             assertFalse(a.isCompletedNormally());
             assertFalse(a.isCompletedAbnormally());
@@ -64,8 +64,6 @@ public class ForkJoinTaskTest extends JS
             assertFalse(a.isCancelled());
             assertNull(a.getException());
             assertNull(a.getRawResult());
-        } finally {
-            joinPool(pool);
         }
     }