--- jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2015/10/04 02:21:43	1.66
+++ jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2015/10/04 02:24:49	1.67
@@ -549,9 +549,9 @@ public class ThreadPoolExecutorSubclassT
             new CustomTPE(1, 1,
                           LONG_DELAY_MS, MILLISECONDS,
                           new ArrayBlockingQueue<Runnable>(10));
-        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);
             assertEquals(0, p.getTaskCount());
             p.execute(new CheckedRunnable() {
                 public void realRun() throws InterruptedException {
@@ -561,9 +561,7 @@ public class ThreadPoolExecutorSubclassT
                 }});
             assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
             assertEquals(1, p.getTaskCount());
-        } finally {
             done.countDown();
-            joinPool(p);
         }
     }