--- jsr166/src/test/tck/RecursiveTaskTest.java	2014/12/31 19:05:43	1.31
+++ jsr166/src/test/tck/RecursiveTaskTest.java	2015/10/04 18:28:51	1.33
@@ -20,7 +20,7 @@ import junit.framework.TestSuite;
 public class RecursiveTaskTest extends JSR166TestCase {
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(RecursiveTaskTest.class);
@@ -41,15 +41,13 @@ public class RecursiveTaskTest extends J
     }
 
     private <T> T testInvokeOnPool(ForkJoinPool pool, RecursiveTask<T> a) {
-        try {
+        try (PoolCleaner cleaner = cleaner(pool)) {
             checkNotDone(a);
 
             T result = pool.invoke(a);
 
             checkCompletedNormally(a, result);
             return result;
-        } finally {
-            joinPool(pool);
         }
     }