--- old/test/runtime/NMT/CommandLineEmptyArgument.java	2016-08-11 13:36:07.045634400 -0400
+++ new/test/runtime/NMT/CommandLineEmptyArgument.java	2016-08-11 13:36:06.638847900 -0400
@@ -25,12 +25,13 @@
  * @test
  * @key nmt
  * @summary Empty argument to NMT should result in an informative error message
- * @library /testlibrary
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          java.management
  */
 
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
 
 public class CommandLineEmptyArgument {