--- old/test/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java	2014-12-09 15:13:03.085781074 +0100
+++ new/test/compiler/intrinsics/bmi/verifycode/BmiIntrinsicBase.java	2014-12-09 15:13:02.905781069 +0100
@@ -25,8 +25,8 @@
 import com.oracle.java.testlibrary.Asserts;
 import com.oracle.java.testlibrary.Platform;
 import com.oracle.java.testlibrary.Utils;
-import sun.hotspot.code.NMethod;
-import sun.hotspot.cpuinfo.CPUInfo;
+import jdk.testlib.code.NMethod;
+import jdk.testlib.cpuinfo.CPUInfo;
 
 import java.lang.reflect.Executable;
 import java.lang.reflect.Method;