--- jsr166/src/test/tck/ThreadPoolExecutorTest.java	2015/10/04 03:51:35	1.93
+++ jsr166/src/test/tck/ThreadPoolExecutorTest.java	2015/10/04 03:52:33	1.94
@@ -1238,12 +1238,10 @@ public class ThreadPoolExecutorTest exte
                                    new ArrayBlockingQueue<Runnable>(1), h);
 
         try { p.shutdown(); } catch (SecurityException ok) { return; }
-        try {
+        try (PoolCleaner cleaner = cleaner(p)) {
             TrackedNoOpRunnable r = new TrackedNoOpRunnable();
             p.execute(r);
             assertFalse(r.done);
-        } finally {
-            joinPool(p);
         }
     }