--- old/test/compiler/compilercontrol/share/scenario/Scenario.java	2016-08-11 13:15:56.155508500 -0400
+++ new/test/compiler/compilercontrol/share/scenario/Scenario.java	2016-08-11 13:15:55.729549600 -0400
@@ -30,8 +30,8 @@
 import compiler.compilercontrol.share.processors.PrintDirectivesProcessor;
 import compiler.compilercontrol.share.processors.PrintProcessor;
 import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.Pair;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.util.Pair;
 
 import java.lang.reflect.Executable;
 import java.util.ArrayList;