--- old/test/compiler/intrinsics/bmi/TestBlsrI.java	2014-12-09 15:13:00.905781005 +0100
+++ new/test/compiler/intrinsics/bmi/TestBlsrI.java	2014-12-09 15:13:00.525780993 +0100
@@ -27,15 +27,15 @@
  * @bug 8031321
  * @summary Verify that results of computations are the same w/
  *          and w/o usage of BLSR instruction
- * @library /testlibrary /testlibrary/whitebox
+ * @library /testlibrary /../../test/lib
  * @build TestBlsrI BMITestRunner Expr
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main ClassFileInstaller jdk.testlib.WhiteBox
+ *                              jdk.testlib.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
  *                   -XX:+WhiteBoxAPI TestBlsrI
  */
 
-import sun.hotspot.cpuinfo.CPUInfo;
+import jdk.testlib.cpuinfo.CPUInfo;
 
 public class TestBlsrI {