--- old/test/gc/g1/TestShrinkAuxiliaryData.java	2016-08-11 13:30:34.972144000 -0400
+++ new/test/gc/g1/TestShrinkAuxiliaryData.java	2016-08-11 13:30:34.555709000 -0400
@@ -22,9 +22,9 @@
  */
 
 import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
 import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
 import jdk.test.lib.Utils;
 import java.io.IOException;
 import java.lang.management.ManagementFactory;