--- jsr166/src/test/tck/ScheduledExecutorTest.java	2016/02/22 23:16:06	1.80
+++ jsr166/src/test/tck/ScheduledExecutorTest.java	2016/09/15 17:31:16	1.82
@@ -18,7 +18,6 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.RejectedExecutionException;
@@ -511,15 +510,14 @@ public class ScheduledExecutorTest exten
      * isShutdown is false before shutdown, true after
      */
     public void testIsShutdown() {
-
         final ScheduledThreadPoolExecutor p = new ScheduledThreadPoolExecutor(1);
-        try {
-            assertFalse(p.isShutdown());
-        }
-        finally {
-            try { p.shutdown(); } catch (SecurityException ok) { return; }
+        assertFalse(p.isShutdown());
+        try (PoolCleaner cleaner = cleaner(p)) {
+            try {
+                p.shutdown();
+                assertTrue(p.isShutdown());
+            } catch (SecurityException ok) {}
         }
-        assertTrue(p.isShutdown());
     }
 
     /**