--- jsr166/src/test/tck/CountedCompleterTest.java	2015/04/25 04:55:30	1.18
+++ jsr166/src/test/tck/CountedCompleterTest.java	2015/10/04 18:40:57	1.19
@@ -49,7 +49,7 @@ public class CountedCompleterTest extend
     }
 
     private void testInvokeOnPool(ForkJoinPool pool, ForkJoinTask a) {
-        try {
+        try (PoolCleaner cleaner = cleaner(pool)) {
             assertFalse(a.isDone());
             assertFalse(a.isCompletedNormally());
             assertFalse(a.isCompletedAbnormally());
@@ -65,8 +65,6 @@ public class CountedCompleterTest extend
             assertFalse(a.isCancelled());
             assertNull(a.getException());
             assertNull(a.getRawResult());
-        } finally {
-            joinPool(pool);
         }
     }