--- old/test/ProblemList.txt	2016-08-24 11:59:03.227475986 +0300
+++ new/test/ProblemList.txt	2016-08-24 11:59:03.141475988 +0300
@@ -367,8 +367,6 @@
 
 sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java              8160376 macosx-all
 
-sun/tools/jps/TestJpsJar.java                                   8160923 generic-all
-
 sun/tools/jps/TestJpsJarRelative.java                           6456333 generic-all
 
 sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java    8057732 generic-all
--- old/test/sun/tools/jps/JpsBase.java	2016-08-24 11:59:03.528475980 +0300
+++ new/test/sun/tools/jps/JpsBase.java	2016-08-24 11:59:03.424475982 +0300
@@ -25,8 +25,8 @@
 import java.net.URL;
 import java.util.List;
 
-import jdk.testlibrary.OutputAnalyzer;
-import jdk.testlibrary.ProcessTools;
+import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.ProcessTools;
 
 /**
  * The base class for testing the jps utility.
--- old/test/sun/tools/jps/JpsHelper.java	2016-08-24 11:59:03.827475974 +0300
+++ new/test/sun/tools/jps/JpsHelper.java	2016-08-24 11:59:03.728475976 +0300
@@ -21,8 +21,8 @@
  * questions.
  */
 
-import static jdk.testlibrary.Asserts.assertGreaterThan;
-import static jdk.testlibrary.Asserts.assertTrue;
+import static jdk.test.lib.Asserts.assertGreaterThan;
+import static jdk.test.lib.Asserts.assertTrue;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -35,11 +35,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import jdk.testlibrary.Asserts;
-import jdk.testlibrary.JDKToolLauncher;
-import jdk.testlibrary.OutputAnalyzer;
-import jdk.testlibrary.Utils;
-import jdk.testlibrary.ProcessTools;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.Utils;
+import jdk.test.lib.ProcessTools;
 
 /**
  * The helper class for running jps utility and verifying output from it
--- old/test/sun/tools/jps/TestJpsClass.java	2016-08-24 11:59:04.152475967 +0300
+++ new/test/sun/tools/jps/TestJpsClass.java	2016-08-24 11:59:04.054475969 +0300
@@ -24,8 +24,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.testlibrary.OutputAnalyzer;
-import jdk.testlibrary.ProcessTools;
+import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.ProcessTools;
 
 /*
  * @test
@@ -34,10 +34,10 @@
  *          For all possible combinations of jps arguments a jps process
  *          will be started from within the test application.
  *          The output should contain proper values.
- * @library /lib/testlibrary
+ * @library /test/lib
  * @modules jdk.jartool/sun.tools.jar
  *          java.management
- * @build jdk.testlibrary.* JpsHelper JpsBase
+ * @build JpsHelper JpsBase
  * @run driver TestJpsClass
  */
 public class TestJpsClass {
--- old/test/sun/tools/jps/TestJpsJar.java	2016-08-24 11:59:04.426475962 +0300
+++ new/test/sun/tools/jps/TestJpsJar.java	2016-08-24 11:59:04.346475963 +0300
@@ -25,8 +25,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import jdk.testlibrary.OutputAnalyzer;
-import jdk.testlibrary.ProcessTools;
+import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.ProcessTools;
 
 /*
  * @test
@@ -35,10 +35,10 @@
  *          For all possible combinations of jps arguments a jps process
  *          will be started from within the test application.
  *          The output should contain proper values.
- * @library /lib/testlibrary
+ * @library /test/lib
  * @modules jdk.jartool/sun.tools.jar
  *          java.management
- * @build jdk.testlibrary.* JpsHelper JpsBase
+ * @build JpsHelper JpsBase
  * @run main/othervm TestJpsJar
  */
 public class TestJpsJar {
--- old/test/sun/tools/jps/TestJpsJarRelative.java	2016-08-24 11:59:04.720475956 +0300
+++ new/test/sun/tools/jps/TestJpsJarRelative.java	2016-08-24 11:59:04.620475958 +0300
@@ -35,10 +35,10 @@
  *          For all possible combinations of jps arguments a jps process
  *          will be started from within the test application.
  *          The output should contain proper values.
- * @library /lib/testlibrary
+ * @library /test/lib
  * @modules jdk.jartool/sun.tools.jar
  *          java.management
- * @build jdk.testlibrary.* JpsHelper JpsBase
+ * @build JpsHelper JpsBase
  * @run main/othervm TestJpsJarRelative
  */
 public class TestJpsJarRelative {
--- old/test/sun/tools/jps/TestJpsSanity.java	2016-08-24 11:59:05.015475950 +0300
+++ new/test/sun/tools/jps/TestJpsSanity.java	2016-08-24 11:59:04.916475952 +0300
@@ -29,11 +29,11 @@
  * @test
  * @summary This test verifies jps usage and checks that appropriate error message is shown
  *          when running jps with illegal arguments.
- * @library /lib/testlibrary /test/lib/share/classes
+ * @library /test/lib
  * @modules jdk.jartool/sun.tools.jar
  *          java.management
  *          java.base/jdk.internal.misc
- * @build jdk.testlibrary.* jdk.test.lib.apps.* JpsHelper
+ * @build JpsHelper
  * @run driver TestJpsSanity
  */
 public class TestJpsSanity {