--- old/test/jdk/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java	2018-10-12 13:55:50.000000000 +0800
+++ new/test/jdk/sun/net/www/protocol/jar/MultiReleaseJarURLConnection.java	2018-10-12 13:55:49.000000000 +0800
@@ -25,11 +25,14 @@
  * @test
  * @bug 8132734 8144062 8159785 8194070
  * @summary Test that URL connections to multi-release jars can be runtime versioned
- * @library /lib/testlibrary/java/util/jar
+ * @library /lib /test/lib
  * @modules jdk.compiler
  *          jdk.httpserver
  *          jdk.jartool
- * @build Compiler JarBuilder CreateMultiReleaseTestJars SimpleHttpServer
+ * @build jdk.test.lib.compiler.Compiler
+ *        jdk.test.lib.util.JarBuilder
+ *        jdk.test.lib.util.SimpleHttpServer
+ *        mrjar.CreateMultiReleaseTestJars
  * @run testng MultiReleaseJarURLConnection
  */
 
@@ -47,6 +50,11 @@
 import java.util.Enumeration;
 import java.util.jar.JarFile;
 
+import jdk.test.lib.compiler.Compiler;
+import jdk.test.lib.util.JarBuilder;
+import jdk.test.lib.util.SimpleHttpServer;
+import mrjar.CreateMultiReleaseTestJars;
+
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;