--- a/test/hotspot/jtreg/gc/TestAgeOutput.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/TestAgeOutput.java	Fri Feb 08 11:52:33 2019 +0100
@@ -55,12 +55,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
-import static jdk.test.lib.Asserts.*;
-
 public class TestAgeOutput {
 
     public static void checkPattern(String pattern, String what) throws Exception {

--- a/test/hotspot/jtreg/gc/TestCardTablePageCommits.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/TestCardTablePageCommits.java	Fri Feb 08 11:52:33 2019 +0100
@@ -23,7 +23,6 @@
 
 package gc;
 
-import jdk.test.lib.JDKToolFinder;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.Platform;

--- a/test/hotspot/jtreg/gc/TestGenerationPerfCounter.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/TestGenerationPerfCounter.java	Fri Feb 08 11:52:33 2019 +0100
@@ -24,7 +24,6 @@
 package gc;
 
 import static jdk.test.lib.Asserts.*;
-import gc.testlibrary.PerfCounter;
 import gc.testlibrary.PerfCounters;
 
 

--- a/test/hotspot/jtreg/gc/TestMemoryMXBeansAndPoolsPresence.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/TestMemoryMXBeansAndPoolsPresence.java	Fri Feb 08 11:52:33 2019 +0100
@@ -24,7 +24,6 @@
 package gc;
 
 import java.util.List;
-import java.util.ArrayList;
 import java.lang.management.*;
 import static jdk.test.lib.Asserts.*;
 import java.util.stream.*;

--- a/test/hotspot/jtreg/gc/TestNumWorkerOutput.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/TestNumWorkerOutput.java	Fri Feb 08 11:52:33 2019 +0100
@@ -54,12 +54,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
-import static jdk.test.lib.Asserts.*;
-
 public class TestNumWorkerOutput {
 
     public static void checkPatternOnce(String pattern, String what) throws Exception {

--- a/test/hotspot/jtreg/gc/TestObjectAlignment.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/TestObjectAlignment.java	Fri Feb 08 11:52:33 2019 +0100
@@ -44,9 +44,6 @@
  * @run main/othervm gc.TestObjectAlignment -Xmx20M -XX:-ExplicitGCInvokesConcurrent -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=256
  */
 
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
-
 public class TestObjectAlignment {
 
   public static byte[] garbage;

--- a/test/hotspot/jtreg/gc/TestPolicyNamePerfCounter.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/TestPolicyNamePerfCounter.java	Fri Feb 08 11:52:33 2019 +0100
@@ -24,7 +24,6 @@
 package gc;
 
 import static jdk.test.lib.Asserts.*;
-import gc.testlibrary.PerfCounter;
 import gc.testlibrary.PerfCounters;
 
 

--- a/test/hotspot/jtreg/gc/arguments/AllocationHelper.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/arguments/AllocationHelper.java	Fri Feb 08 11:52:33 2019 +0100
@@ -23,7 +23,6 @@
 
 package gc.arguments;
 
-import java.util.LinkedList;
 import java.util.concurrent.Callable;
 
 /**

--- a/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/arguments/TestSelectDefaultGC.java	Fri Feb 08 11:52:33 2019 +0100
@@ -35,12 +35,9 @@
  * @run driver gc.arguments.TestSelectDefaultGC
  */
 
-import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 
-import java.util.regex.*;
-
 public class TestSelectDefaultGC {
     public static void assertVMOption(OutputAnalyzer output, String option, boolean value) {
         output.shouldMatch(" " + option + " .*=.* " + value + " ");

--- a/test/hotspot/jtreg/gc/arguments/TestShrinkHeapInSteps.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/arguments/TestShrinkHeapInSteps.java	Fri Feb 08 11:52:33 2019 +0100
@@ -37,7 +37,6 @@
 
 import java.util.LinkedList;
 import java.util.Arrays;
-import java.util.Collections;
 import jdk.test.lib.Utils;
 
 public class TestShrinkHeapInSteps {

--- a/test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java	Fri Feb 08 11:52:33 2019 +0100
@@ -42,8 +42,6 @@
 import jdk.test.lib.process.ProcessTools;
 import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
-import java.util.ArrayList;
-import java.util.Arrays;
 import sun.hotspot.WhiteBox;
 
 public class TestCMSClassUnloadingEnabledHWM {

--- a/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/class_unloading/TestG1ClassUnloadingHWM.java	Fri Feb 08 11:52:33 2019 +0100
@@ -39,8 +39,6 @@
 
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
-import java.util.ArrayList;
-import java.util.Arrays;
 import sun.hotspot.WhiteBox;
 
 public class TestG1ClassUnloadingHWM {

--- a/test/hotspot/jtreg/gc/concurrent_phase_control/CheckControl.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/concurrent_phase_control/CheckControl.java	Fri Feb 08 11:52:33 2019 +0100
@@ -51,7 +51,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 

--- a/test/hotspot/jtreg/gc/epsilon/TestArraycopyCheckcast.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/epsilon/TestArraycopyCheckcast.java	Fri Feb 08 11:52:33 2019 +0100
@@ -38,8 +38,6 @@
  * @run main/othervm -Xmx1g -Xbatch -Xcomp -XX:-TieredCompilation  -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestArraycopyCheckcast
  */
 
-import java.util.Random;
-
 public class TestArraycopyCheckcast {
 
   static int COUNT = Integer.getInteger("count", 1000);

--- a/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java	Fri Feb 08 11:52:33 2019 +0100
@@ -32,7 +32,6 @@
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestEpsilonEnabled
  */
 
-import jdk.test.lib.Platform;
 import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
 

--- a/test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java	Fri Feb 08 11:52:33 2019 +0100
@@ -36,7 +36,6 @@
  */
 
 import java.lang.management.*;
-import java.util.*;
 
 public class TestMemoryMXBeans {
 

--- a/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/g1/TestEagerReclaimHumongousRegionsLog.java	Fri Feb 08 11:52:33 2019 +0100
@@ -39,12 +39,8 @@
 import sun.hotspot.WhiteBox;
 
 import java.util.Arrays;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import jdk.test.lib.Asserts;
 
-import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 

--- a/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/g1/TestLargePageUseForAuxMemory.java	Fri Feb 08 11:52:33 2019 +0100
@@ -38,9 +38,6 @@
  */
 
 import java.lang.Math;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.Asserts;

--- a/test/hotspot/jtreg/gc/g1/TestPLABOutput.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/g1/TestPLABOutput.java	Fri Feb 08 11:52:33 2019 +0100
@@ -41,7 +41,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jdk.test.lib.Platform;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 

--- a/test/hotspot/jtreg/gc/g1/TestPeriodicLogMessages.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/g1/TestPeriodicLogMessages.java	Fri Feb 08 11:52:33 2019 +0100
@@ -36,7 +36,6 @@
 
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.Platform;
 
 public class TestPeriodicLogMessages {
 

--- a/test/hotspot/jtreg/gc/g1/TestRemsetLoggingTools.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/g1/TestRemsetLoggingTools.java	Fri Feb 08 11:52:33 2019 +0100
@@ -27,13 +27,10 @@
  * Common helpers for TestRemsetLogging* tests
  */
 
-import com.sun.management.HotSpotDiagnosticMXBean;
-import com.sun.management.VMOption;
 import sun.hotspot.WhiteBox;
 
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
-import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Arrays;
 

--- a/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/g1/TestShrinkAuxiliaryData.java	Fri Feb 08 11:52:33 2019 +0100
@@ -27,7 +27,6 @@
 import jdk.test.lib.Platform;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.Utils;
 import jtreg.SkippedException;
 
 import java.io.IOException;
@@ -36,7 +35,6 @@
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;

--- a/test/hotspot/jtreg/gc/g1/TestStringDeduplicationTools.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/g1/TestStringDeduplicationTools.java	Fri Feb 08 11:52:33 2019 +0100
@@ -27,9 +27,7 @@
  * Common code for string deduplication tests
  */
 
-import java.lang.management.*;
 import java.lang.reflect.*;
-import java.security.*;
 import java.util.*;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;

--- a/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/g1/TestVerifyGCType.java	Fri Feb 08 11:52:33 2019 +0100
@@ -38,7 +38,6 @@
 import java.util.Collections;
 
 import jdk.test.lib.Asserts;
-import jdk.test.lib.Utils;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import sun.hotspot.WhiteBox;

--- a/test/hotspot/jtreg/gc/g1/mixedgc/TestOldGenCollectionUsage.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/g1/mixedgc/TestOldGenCollectionUsage.java	Fri Feb 08 11:52:33 2019 +0100
@@ -42,8 +42,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Collections;
-
 import java.lang.management.*;
 
 // 8195115 says that for the "G1 Old Gen" MemoryPool, CollectionUsage.used

--- a/test/hotspot/jtreg/gc/logging/TestDeprecatedPrintFlags.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/logging/TestDeprecatedPrintFlags.java	Fri Feb 08 11:52:33 2019 +0100
@@ -36,10 +36,8 @@
 
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
-import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.List;
 import java.util.stream.Collectors;
 
 public class TestDeprecatedPrintFlags {

--- a/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/logging/TestMetaSpaceLog.java	Fri Feb 08 11:52:33 2019 +0100
@@ -27,7 +27,6 @@
 import java.io.File;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.List;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.regex.Matcher;

--- a/test/hotspot/jtreg/gc/logging/TestPrintReferences.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/logging/TestPrintReferences.java	Fri Feb 08 11:52:33 2019 +0100
@@ -36,8 +36,6 @@
 
 import java.lang.ref.SoftReference;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 import java.util.regex.Pattern;

--- a/test/hotspot/jtreg/gc/metaspace/TestMetaspaceMemoryPool.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/metaspace/TestMetaspaceMemoryPool.java	Fri Feb 08 11:52:33 2019 +0100
@@ -26,8 +26,6 @@
 import java.util.List;
 import java.lang.management.*;
 import jdk.test.lib.Platform;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.OutputAnalyzer;
 import static jdk.test.lib.Asserts.*;
 
 /* @test TestMetaspaceMemoryPool

--- a/test/hotspot/jtreg/gc/metaspace/TestPerfCountersAndMemoryPools.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/metaspace/TestPerfCountersAndMemoryPools.java	Fri Feb 08 11:52:33 2019 +0100
@@ -28,7 +28,6 @@
 
 import jdk.test.lib.Platform;
 import static jdk.test.lib.Asserts.*;
-import gc.testlibrary.PerfCounter;
 import gc.testlibrary.PerfCounters;
 
 /* @test TestPerfCountersAndMemoryPools

--- a/test/hotspot/jtreg/gc/nvdimm/TestHumongousObjectsOnNvdimm.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/nvdimm/TestHumongousObjectsOnNvdimm.java	Fri Feb 08 11:52:33 2019 +0100
@@ -41,7 +41,6 @@
 import sun.hotspot.WhiteBox;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
 import gc.testlibrary.Helpers;
 

--- a/test/hotspot/jtreg/gc/nvdimm/TestOldObjectsOnNvdimm.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/nvdimm/TestOldObjectsOnNvdimm.java	Fri Feb 08 11:52:33 2019 +0100
@@ -41,7 +41,6 @@
 import sun.hotspot.WhiteBox;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
 
 /*

--- a/test/hotspot/jtreg/gc/nvdimm/TestYoungObjectsOnDram.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/nvdimm/TestYoungObjectsOnDram.java	Fri Feb 08 11:52:33 2019 +0100
@@ -41,7 +41,6 @@
 import sun.hotspot.WhiteBox;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
 
 /**

--- a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLocker.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLocker.java	Fri Feb 08 11:52:33 2019 +0100
@@ -30,7 +30,6 @@
 import java.lang.management.MemoryPoolMXBean;
 import java.lang.management.ManagementFactory;
 import java.lang.management.MemoryUsage;
-import java.nio.ByteBuffer;
 import java.util.ArrayDeque;
 import java.util.HashMap;
 import java.util.List;

--- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGC.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGC.java	Fri Feb 08 11:52:33 2019 +0100
@@ -26,7 +26,6 @@
 // A test that stresses a full GC by allocating objects of different lifetimes
 // and concurrently calling System.gc().
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeMap;

--- a/test/hotspot/jtreg/gc/whitebox/TestConcMarkCycleWB.java	Fri Feb 08 02:57:40 2019 +0100
+++ b/test/hotspot/jtreg/gc/whitebox/TestConcMarkCycleWB.java	Fri Feb 08 11:52:33 2019 +0100
@@ -38,7 +38,6 @@
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC gc.whitebox.TestConcMarkCycleWB
  * @summary Verifies that ConcurrentMarking-related WB works properly
  */
-import static jdk.test.lib.Asserts.assertFalse;
 import static jdk.test.lib.Asserts.assertTrue;
 import sun.hotspot.WhiteBox;