--- old/test/compiler/rtm/locking/TestUseRTMDeopt.java 2015-04-28 14:48:54.277863767 +0300 +++ new/test/compiler/rtm/locking/TestUseRTMDeopt.java 2015-04-28 14:48:54.205863769 +0300 @@ -37,9 +37,9 @@ * -XX:+WhiteBoxAPI TestUseRTMDeopt */ -import com.oracle.java.testlibrary.*; -import com.oracle.java.testlibrary.cli.CommandLineOptionTest; -import com.oracle.java.testlibrary.cli.predicate.AndPredicate; +import jdk.test.lib.*; +import jdk.test.lib.cli.CommandLineOptionTest; +import jdk.test.lib.cli.predicate.AndPredicate; import rtm.*; import rtm.predicate.SupportedCPU; import rtm.predicate.SupportedVM;