--- jsr166/src/test/tck/ThreadPoolExecutorTest.java	2015/10/04 01:56:51	1.73
+++ jsr166/src/test/tck/ThreadPoolExecutorTest.java	2015/10/04 01:58:38	1.74
@@ -306,10 +306,11 @@ public class ThreadPoolExecutorTest exte
             new ThreadPoolExecutor(1, 2,
                                    LONG_DELAY_MS, MILLISECONDS,
                                    new ArrayBlockingQueue<Runnable>(10));
-        RejectedExecutionHandler h = new NoOpREHandler();
-        p.setRejectedExecutionHandler(h);
-        assertSame(h, p.getRejectedExecutionHandler());
-        joinPool(p);
+        try (PoolCleaner cleaner = cleaner(p)) {
+            RejectedExecutionHandler handler = new NoOpREHandler();
+            p.setRejectedExecutionHandler(handler);
+            assertSame(handler, p.getRejectedExecutionHandler());
+        }
     }
 
     /**