--- old/test/runtime/NMT/ThreadedMallocTestType.java	2014-12-09 15:13:24.705781760 +0100
+++ new/test/runtime/NMT/ThreadedMallocTestType.java	2014-12-09 15:13:24.357781749 +0100
@@ -24,15 +24,15 @@
 /*
  * @test
  * @key nmt jcmd
- * @library /testlibrary /testlibrary/whitebox
+ * @library /testlibrary /../../test/lib
  * @build ThreadedMallocTestType
- * @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 -XX:NativeMemoryTracking=detail ThreadedMallocTestType
  */
 
 import com.oracle.java.testlibrary.*;
-import sun.hotspot.WhiteBox;
+import jdk.testlib.WhiteBox;
 
 public class ThreadedMallocTestType {
   public static long memAlloc1;