--- old/test/runtime/NMT/ReleaseNoCommit.java	2014-12-09 15:13:24.549781755 +0100
+++ new/test/runtime/NMT/ReleaseNoCommit.java	2014-12-09 15:13:24.333781748 +0100
@@ -25,9 +25,9 @@
  * @test
  * @summary Release uncommitted memory and make sure NMT handles it correctly
  * @key nmt regression
- * @library /testlibrary /testlibrary/whitebox
+ * @library /testlibrary /../../test/lib
  * @build ReleaseNoCommit
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run main ClassFileInstaller jdk.testlib.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary ReleaseNoCommit
  */
 
@@ -35,7 +35,7 @@
 import com.oracle.java.testlibrary.OutputAnalyzer;
 import com.oracle.java.testlibrary.ProcessTools;
 
-import sun.hotspot.WhiteBox;
+import jdk.testlib.WhiteBox;
 
 public class ReleaseNoCommit {