--- a/hotspot/test/gc/metaspace/TestMetaspacePerfCounters.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/gc/metaspace/TestMetaspacePerfCounters.java	Thu May 11 14:03:50 2017 -0700
@@ -26,7 +26,7 @@
 import java.util.ArrayList;
 
 import jdk.test.lib.ByteCodeLoader;
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.Platform;
 
 import sun.management.ManagementFactoryHelper;

--- a/hotspot/test/runtime/BadObjectClass/BootstrapRedefine.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/BadObjectClass/BootstrapRedefine.java	Thu May 11 14:03:50 2017 -0700
@@ -31,7 +31,7 @@
  * @run main BootstrapRedefine
  */
 
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 

--- a/hotspot/test/runtime/RedefineTests/ModifyAnonymous.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/RedefineTests/ModifyAnonymous.java	Thu May 11 14:03:50 2017 -0700
@@ -34,15 +34,14 @@
 
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
-import java.lang.NoSuchFieldException;
-import java.lang.NoSuchMethodException;
 import java.lang.RuntimeException;
 import java.lang.instrument.ClassDefinition;
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.IllegalClassFormatException;
 import java.lang.instrument.Instrumentation;
 import java.security.ProtectionDomain;
-import jdk.test.lib.*;
+
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 
 public class ModifyAnonymous {
 

--- a/hotspot/test/runtime/Unsafe/DefineClass.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/Unsafe/DefineClass.java	Thu May 11 14:03:50 2017 -0700
@@ -32,8 +32,8 @@
  */
 
 import java.security.ProtectionDomain;
-import java.io.InputStream;
-import jdk.test.lib.InMemoryJavaCompiler;
+
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.internal.misc.Unsafe;
 import static jdk.test.lib.Asserts.*;
 

--- a/hotspot/test/runtime/Unsafe/NestedUnsafe.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/Unsafe/NestedUnsafe.java	Thu May 11 14:03:50 2017 -0700
@@ -31,12 +31,9 @@
  * @run main NestedUnsafe
  */
 
-import java.security.ProtectionDomain;
-import java.io.InputStream;
 import java.lang.*;
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.internal.misc.Unsafe;
-import static jdk.test.lib.Asserts.*;
 
 // package p;
 

--- a/hotspot/test/runtime/defineAnonClass/NestedUnsafe.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/defineAnonClass/NestedUnsafe.java	Thu May 11 14:03:50 2017 -0700
@@ -34,11 +34,10 @@
 
 package p;
 
-import java.security.ProtectionDomain;
-import java.io.InputStream;
 import java.lang.*;
-import jdk.test.lib.*;
+
 import jdk.internal.misc.Unsafe;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 
 
 // Test that an anonymous class in package 'p' cannot define its own anonymous class

--- a/hotspot/test/runtime/defineAnonClass/NestedUnsafe2.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/defineAnonClass/NestedUnsafe2.java	Thu May 11 14:03:50 2017 -0700
@@ -34,11 +34,10 @@
 
 package p;
 
-import java.security.ProtectionDomain;
-import java.io.InputStream;
 import java.lang.*;
-import jdk.test.lib.*;
+
 import jdk.internal.misc.Unsafe;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 
 
 // Test that an anonymous class that gets put in its host's package cannot define

--- a/hotspot/test/runtime/getSysPackage/GetSysPkgTest.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/getSysPackage/GetSysPkgTest.java	Thu May 11 14:03:50 2017 -0700
@@ -33,7 +33,7 @@
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 

--- a/hotspot/test/runtime/modules/ModuleStress/ModuleStress.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/ModuleStress/ModuleStress.java	Thu May 11 14:03:50 2017 -0700
@@ -38,8 +38,7 @@
 
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.InMemoryJavaCompiler;
-import java.io.File;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 
 public class ModuleStress {
 

--- a/hotspot/test/runtime/modules/PatchModule/PatchModule2Dirs.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModule2Dirs.java	Thu May 11 14:03:50 2017 -0700
@@ -30,10 +30,9 @@
  * @run main PatchModule2Dirs
  */
 
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
-import java.io.File;
 
 public class PatchModule2Dirs {
 

--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleCDS.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleCDS.java	Thu May 11 14:03:50 2017 -0700
@@ -31,8 +31,7 @@
  * @run main PatchModuleCDS
  */
 
-import java.io.File;
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 

--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleClassList.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleClassList.java	Thu May 11 14:03:50 2017 -0700
@@ -33,7 +33,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 

--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleJavaBase.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleJavaBase.java	Thu May 11 14:03:50 2017 -0700
@@ -31,7 +31,7 @@
  * @run main PatchModuleJavaBase
  */
 
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 

--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleTest.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleTest.java	Thu May 11 14:03:50 2017 -0700
@@ -31,7 +31,7 @@
  * @run main PatchModuleTest
  */
 
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 

--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleTestJar.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleTestJar.java	Thu May 11 14:03:50 2017 -0700
@@ -31,7 +31,7 @@
  * @run main PatchModuleTestJar
  */
 
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 

--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleTestJarDir.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleTestJarDir.java	Thu May 11 14:03:50 2017 -0700
@@ -32,8 +32,8 @@
  */
 
 import java.io.File;
-import java.nio.file.Files;
-import jdk.test.lib.InMemoryJavaCompiler;
+
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 

--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleTraceCL.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleTraceCL.java	Thu May 11 14:03:50 2017 -0700
@@ -32,8 +32,7 @@
  * @run main PatchModuleTraceCL
  */
 
-import java.io.File;
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 

--- a/hotspot/test/runtime/modules/Visibility/PatchModuleVisibility.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/Visibility/PatchModuleVisibility.java	Thu May 11 14:03:50 2017 -0700
@@ -36,7 +36,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;
 

--- a/hotspot/test/runtime/modules/Visibility/XbootcpNoVisibility.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/Visibility/XbootcpNoVisibility.java	Thu May 11 14:03:50 2017 -0700
@@ -31,7 +31,7 @@
  * @run main/othervm XbootcpNoVisibility
  */
 
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.ProcessTools;
 import jdk.test.lib.process.OutputAnalyzer;
 

--- a/hotspot/test/runtime/modules/Visibility/XbootcpVisibility.java	Thu May 11 18:11:13 2017 +0000
+++ b/hotspot/test/runtime/modules/Visibility/XbootcpVisibility.java	Thu May 11 14:03:50 2017 -0700
@@ -36,7 +36,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 
-import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.compiler.InMemoryJavaCompiler;
 import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.process.ProcessTools;