--- jsr166/src/test/tck/ThreadPoolExecutorTest.java	2015/10/04 03:49:33	1.92
+++ jsr166/src/test/tck/ThreadPoolExecutorTest.java	2015/10/04 03:51:35	1.93
@@ -1219,12 +1219,12 @@ public class ThreadPoolExecutorTest exte
                                    LONG_DELAY_MS, MILLISECONDS,
                                    new ArrayBlockingQueue<Runnable>(1));
         try { p.shutdown(); } catch (SecurityException ok) { return; }
-        try {
-            p.execute(new NoOpRunnable());
-            shouldThrow();
-        } catch (RejectedExecutionException success) {}
-
-        joinPool(p);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            try {
+                p.execute(new NoOpRunnable());
+                shouldThrow();
+            } catch (RejectedExecutionException success) {}
+        }
     }
 
     /**