--- old/test/compiler/compilercontrol/share/method/MethodGenerator.java	2016-08-11 13:15:26.509462300 -0400
+++ new/test/compiler/compilercontrol/share/method/MethodGenerator.java	2016-08-11 13:15:26.096912500 -0400
@@ -26,8 +26,8 @@
 import compiler.compilercontrol.share.method.MethodDescriptor.PatternType;
 import compiler.compilercontrol.share.method.MethodDescriptor.Separator;
 import compiler.compilercontrol.share.pool.PoolHelper;
-import jdk.test.lib.Pair;
-import jdk.test.lib.Triple;
+import jdk.test.lib.util.Pair;
+import jdk.test.lib.util.Triple;
 import jdk.test.lib.Utils;
 
 import java.lang.reflect.Executable;