--- old/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java	2014-12-09 15:12:59.657780966 +0100
+++ new/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java	2014-12-09 15:12:59.337780956 +0100
@@ -26,17 +26,17 @@
  * @bug 8031321
  * @summary Verify processing of UseCountTrailingZerosInstruction option
  *          on CPU without TZCNT instruction (BMI1 feature) support.
- * @library /testlibrary /testlibrary/whitebox
+ * @library /testlibrary /../../test/lib
  * @build TestUseCountTrailingZerosInstructionOnUnsupportedCPU
  *        BMIUnsupportedCPUTest
- * @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
  *                   TestUseCountTrailingZerosInstructionOnUnsupportedCPU
  */
 
-import sun.hotspot.cpuinfo.CPUInfo;
+import jdk.testlib.cpuinfo.CPUInfo;
 import com.oracle.java.testlibrary.*;
 import com.oracle.java.testlibrary.cli.*;