--- old/test/serviceability/ParserTest.java	2014-12-09 15:13:25.925781799 +0100
+++ new/test/serviceability/ParserTest.java	2014-12-09 15:13:25.621781789 +0100
@@ -24,18 +24,18 @@
 /*
  * @test
  * @summary Test that the diagnostic command arguemnt parser works
- * @library /testlibrary /testlibrary/whitebox
- * @build ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.parser.*
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *                              sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @library /testlibrary /../../test/lib
+ * @build ClassFileInstaller jdk.testlib.WhiteBox jdk.testlib.parser.*
+ * @run main ClassFileInstaller jdk.testlib.WhiteBox
+ *                              jdk.testlib.WhiteBox$WhiteBoxPermission
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ParserTest
  */
 
 import java.math.BigInteger;
 
-import sun.hotspot.parser.DiagnosticCommand;
-import sun.hotspot.parser.DiagnosticCommand.DiagnosticArgumentType;
-import sun.hotspot.WhiteBox;
+import jdk.testlib.parser.DiagnosticCommand;
+import jdk.testlib.parser.DiagnosticCommand.DiagnosticArgumentType;
+import jdk.testlib.WhiteBox;
 
 public class ParserTest {
     WhiteBox wb;