--- old/test/jdk/java/util/concurrent/tck/ExecutorsTest.java	2021-01-09 11:36:14.144794395 -0800
+++ new/test/jdk/java/util/concurrent/tck/ExecutorsTest.java	2021-01-09 11:36:13.836796818 -0800
@@ -90,7 +90,7 @@
      */
     public void testNewCachedThreadPool3() {
         try {
-            ExecutorService e = Executors.newCachedThreadPool(null);
+            ExecutorService unused = Executors.newCachedThreadPool(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -124,7 +124,7 @@
      */
     public void testNewSingleThreadExecutor3() {
         try {
-            ExecutorService e = Executors.newSingleThreadExecutor(null);
+            ExecutorService unused = Executors.newSingleThreadExecutor(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -172,7 +172,7 @@
      */
     public void testNewFixedThreadPool3() {
         try {
-            ExecutorService e = Executors.newFixedThreadPool(2, null);
+            ExecutorService unused = Executors.newFixedThreadPool(2, null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -182,7 +182,7 @@
      */
     public void testNewFixedThreadPool4() {
         try {
-            ExecutorService e = Executors.newFixedThreadPool(0);
+            ExecutorService unused = Executors.newFixedThreadPool(0);
             shouldThrow();
         } catch (IllegalArgumentException success) {}
     }
@@ -204,7 +204,8 @@
      */
     public void testUnconfigurableExecutorServiceNPE() {
         try {
-            ExecutorService e = Executors.unconfigurableExecutorService(null);
+            ExecutorService unused =
+                Executors.unconfigurableExecutorService(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -214,7 +215,8 @@
      */
     public void testUnconfigurableScheduledExecutorServiceNPE() {
         try {
-            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
+            ExecutorService unused =
+                Executors.unconfigurableScheduledExecutorService(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -304,9 +306,11 @@
             Executors.newScheduledThreadPool(2),
         };
 
-        final Runnable sleeper = new CheckedInterruptedRunnable() {
+        final CountDownLatch done = new CountDownLatch(1);
+
+        final Runnable sleeper = new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                delay(LONG_DELAY_MS);
+                done.await(LONG_DELAY_MS, MILLISECONDS);
             }};
 
         List<Thread> threads = new ArrayList<>();
@@ -319,6 +323,7 @@
         }
         for (Thread thread : threads)
             awaitTermination(thread);
+        done.countDown();
         for (ExecutorService executor : executors)
             joinPool(executor);
     }
@@ -578,7 +583,7 @@
      */
     public void testCallableNPE1() {
         try {
-            Callable c = Executors.callable((Runnable) null);
+            Callable unused = Executors.callable((Runnable) null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -588,7 +593,7 @@
      */
     public void testCallableNPE2() {
         try {
-            Callable c = Executors.callable((Runnable) null, one);
+            Callable unused = Executors.callable((Runnable) null, one);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -598,7 +603,7 @@
      */
     public void testCallableNPE3() {
         try {
-            Callable c = Executors.callable((PrivilegedAction) null);
+            Callable unused = Executors.callable((PrivilegedAction) null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -608,7 +613,7 @@
      */
     public void testCallableNPE4() {
         try {
-            Callable c = Executors.callable((PrivilegedExceptionAction) null);
+            Callable unused = Executors.callable((PrivilegedExceptionAction) null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }