--- jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2015/10/04 02:33:09	1.70
+++ jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2015/10/04 02:34:48	1.71
@@ -645,9 +645,9 @@ public class ThreadPoolExecutorSubclassT
             new CustomTPE(1, 1,
                           LONG_DELAY_MS, MILLISECONDS,
                           q);
-        final CountDownLatch threadStarted = new CountDownLatch(1);
-        final CountDownLatch done = new CountDownLatch(1);
-        try {
+        try (PoolCleaner cleaner = cleaner(p)) {
+            final CountDownLatch threadStarted = new CountDownLatch(1);
+            final CountDownLatch done = new CountDownLatch(1);
             FutureTask[] tasks = new FutureTask[5];
             for (int i = 0; i < tasks.length; i++) {
                 Callable task = new CheckedCallable<Boolean>() {
@@ -665,9 +665,7 @@ public class ThreadPoolExecutorSubclassT
             assertFalse(q.contains(tasks[0]));
             assertTrue(q.contains(tasks[tasks.length - 1]));
             assertEquals(tasks.length - 1, q.size());
-        } finally {
             done.countDown();
-            joinPool(p);
         }
     }