--- a/jdk/test/com/sun/jdi/SunBootClassPathEmptyTest.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/com/sun/jdi/SunBootClassPathEmptyTest.java	Fri Aug 19 10:09:53 2016 -0400
@@ -32,7 +32,7 @@
  * @summary Verifies that PathSearchingVirtualMachine.bootClassPath()
  *          returns an empty list in case no bootclass path specified
  *          regardless of sun.boot.class.path option, which is now obsolete
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @compile TestClass.java
  * @compile SunBootClassPathEmptyTest.java
  * @run main/othervm SunBootClassPathEmptyTest

--- a/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/com/sun/management/HotSpotDiagnosticMXBean/DumpHeap.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@
  * @bug 6455258
  * @summary Sanity test for com.sun.management.HotSpotDiagnosticMXBean.dumpHeap method
  * @library /lib/testlibrary
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
  * @build jdk.test.lib.hprof.model.*

--- a/jdk/test/java/lang/ProcessHandle/Basic.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/java/lang/ProcessHandle/Basic.java	Fri Aug 19 10:09:53 2016 -0400
@@ -36,7 +36,6 @@
 
 /*
  * @test
- * @library /test/lib/share/classes
  * @modules java.base/jdk.internal.misc
  *          jdk.management
  * @run testng Basic

--- a/jdk/test/java/lang/ProcessHandle/InfoTest.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/java/lang/ProcessHandle/InfoTest.java	Fri Aug 19 10:09:53 2016 -0400
@@ -48,7 +48,7 @@
 /*
  * @test
  * @bug 8077350 8081566 8081567 8098852 8136597
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.management
  * @build jdk.test.lib.Platform jdk.test.lib.Utils

--- a/jdk/test/java/lang/ProcessHandle/OnExitTest.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/java/lang/ProcessHandle/OnExitTest.java	Fri Aug 19 10:09:53 2016 -0400
@@ -38,7 +38,7 @@
 
 /*
  * @test
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.management
  * @build jdk.test.lib.Platform jdk.test.lib.Utils

--- a/jdk/test/java/lang/ProcessHandle/TreeTest.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/java/lang/ProcessHandle/TreeTest.java	Fri Aug 19 10:09:53 2016 -0400
@@ -44,7 +44,7 @@
 
 /*
  * @test
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  *          jdk.management
  * @build jdk.test.lib.Utils

--- a/jdk/test/java/lang/ref/CleanerTest.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/java/lang/ref/CleanerTest.java	Fri Aug 19 10:09:53 2016 -0400
@@ -49,7 +49,7 @@
 
 /*
  * @test
- * @library /test/lib/share/classes /lib/testlibrary /test/lib
+ * @library /lib/testlibrary /test/lib
  * @build sun.hotspot.WhiteBox
  * @build jdk.test.lib.Utils
  * @modules java.base/jdk.internal

--- a/jdk/test/java/security/SecureRandom/DrbgParametersSpec.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/java/security/SecureRandom/DrbgParametersSpec.java	Fri Aug 19 10:09:53 2016 -0400
@@ -24,7 +24,7 @@
 /* @test
  * @bug 8051408 8158534
  * @summary Make sure DrbgParameters coded as specified
- * @library /test/lib/share/classes
+ * @library /test/lib
  */
 
 import jdk.test.lib.Asserts;

--- a/jdk/test/jdk/internal/ref/Cleaner/ExitOnThrow.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/jdk/internal/ref/Cleaner/ExitOnThrow.java	Fri Aug 19 10:09:53 2016 -0400
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 4954921 8009259
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @modules java.base/jdk.internal.ref
  *          java.base/jdk.internal.misc
  * @build jdk.test.lib.*

--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -44,7 +44,7 @@
  * </pre>
  *
  * @deprecated This class is deprecated. Use the one from
- *             {@code <root>/test/lib/share/classes/jdk/test/lib}
+ *             {@code <root>/test/lib/jdk/test/lib}
  */
 @Deprecated
 public class Asserts {

--- a/jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
 
 /**
  * @deprecated This class is deprecated. Use the one from
- *             {@code <root>/test/lib/share/classes/jdk/test/lib}
+ *             {@code <root>/test/lib/jdk/test/lib}
  */
 @Deprecated
 public final class JDKToolFinder {

--- a/jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -46,7 +46,7 @@
  * }
  * </pre>
  * @deprecated This class is deprecated. Use the one from
- *             {@code <root>/test/lib/share/classes/jdk/test/lib}
+ *             {@code <root>/test/lib/jdk/test/lib}
  */
 @Deprecated
 public class JDKToolLauncher {

--- a/jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
  * Utility class for verifying output and exit value from a {@code Process}.
  *
  * @deprecated  This class is deprecated. Use the one from
- *              {@code <root>/test/lib/share/classes/jdk/test/lib/process}
+ *              {@code <root>/test/lib/jdk/test/lib/process}
  *
  */
 @Deprecated

--- a/jdk/test/lib/testlibrary/jdk/testlibrary/OutputBuffer.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/OutputBuffer.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,7 @@
 
 /**
  * @deprecated This class is deprecated. Use the one from
- *             {@code <root>/test/lib/share/classes/jdk/test/lib/process}
+ *             {@code <root>/test/lib/jdk/test/lib/process}
  */
 @Deprecated
 class OutputBuffer {

--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java	Fri Aug 19 10:09:53 2016 -0400
@@ -29,7 +29,7 @@
 
 /**
  * @deprecated This class is deprecated. Use the one from
- *             {@code <root>/test/lib/share/classes/jdk/test/lib}
+ *             {@code <root>/test/lib/jdk/test/lib}
  */
 @Deprecated
 public class Platform {

--- a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
 
 /**
  * @deprecated This class is deprecated. Use the one from
- *             {@code <root>/test/lib/share/classes/jdk/test/lib/process}
+ *             {@code <root>/test/lib/jdk/test/lib/process}
  */
 @Deprecated
 public final class ProcessTools {

--- a/jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
 
 /**
  * @deprecated This class is deprecated. Use the one from
- *             {@code <root>/test/lib/share/classes/jdk/test/lib/process}
+ *             {@code <root>/test/lib/jdk/test/lib/process}
  */
 @Deprecated
 public final class StreamPumper implements Runnable {

--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@
  * Common library for various test helper functions.
  *
  * @deprecated This class is deprecated. Use the one from
- *             {@code <root>/test/lib/share/classes/jdk/test/lib}
+ *             {@code <root>/test/lib/jdk/test/lib}
  */
 @Deprecated
 public final class Utils {

--- a/jdk/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/sun/jvmstat/monitor/MonitoredVm/TestPollingInterval.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,7 @@
  * @summary setInterval() for local MonitoredHost and local MonitoredVm
  * @modules jdk.jvmstat/sun.jvmstat.monitor
  * @library /lib/testlibrary
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*
  * @run main TestPollingInterval

--- a/jdk/test/sun/misc/SunMiscSignalTest.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/sun/misc/SunMiscSignalTest.java	Fri Aug 19 10:09:53 2016 -0400
@@ -43,7 +43,7 @@
 
 /*
  * @test
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @modules jdk.unsupported
  *          java.base/jdk.internal.misc
  * @build jdk.test.lib.Platform jdk.test.lib.Utils

--- a/jdk/test/sun/security/tools/jarsigner/AltProvider.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/sun/security/tools/jarsigner/AltProvider.java	Fri Aug 19 10:09:53 2016 -0400
@@ -25,7 +25,7 @@
  * @test
  * @bug 4906940 8130302
  * @summary -providerPath, -providerClass, -addprovider, and -providerArg
- * @library /lib/testlibrary /test/lib/share/classes
+ * @library /lib/testlibrary /test/lib
  * @modules java.base/jdk.internal.misc
  */
 

--- a/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java	Fri Aug 19 10:09:53 2016 -0400
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Basic test for jhsdb launcher
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @library /lib/testlibrary
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*

--- a/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
  * @bug 8042397
  * @summary Unit test for jmap utility test heap configuration reader
  * @modules jdk.hotspot.agent/sun.jvm.hotspot
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @library /lib/testlibrary
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*

--- a/jdk/test/sun/tools/jinfo/JInfoTest.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/sun/tools/jinfo/JInfoTest.java	Fri Aug 19 10:09:53 2016 -0400
@@ -37,7 +37,7 @@
  * @test
  * @summary Unit test for jinfo utility
  * @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @build jdk.test.lib.*
  * @build jdk.test.lib.apps.*
  * @build jdk.test.lib.process.*

--- a/jdk/test/sun/tools/jmap/BasicJMapTest.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/sun/tools/jmap/BasicJMapTest.java	Fri Aug 19 10:09:53 2016 -0400
@@ -37,7 +37,7 @@
  * @summary Unit test for jmap utility
  * @key intermittent
  * @library /lib/testlibrary
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.hprof.*
  * @build jdk.test.lib.hprof.model.*

--- a/jdk/test/sun/tools/jps/TestJpsSanity.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/sun/tools/jps/TestJpsSanity.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
  * @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 /lib/testlibrary /test/lib
  * @modules jdk.jartool/sun.tools.jar
  *          java.management
  *          java.base/jdk.internal.misc

--- a/jdk/test/sun/tools/jstack/DeadlockDetectionTest.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/sun/tools/jstack/DeadlockDetectionTest.java	Fri Aug 19 10:09:53 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
 /*
  * @test
  * @summary Test deadlock detection
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @library /lib/testlibrary
  * @build jdk.testlibrary.*
  * @build jdk.test.lib.apps.*

--- a/jdk/test/tools/jar/multiRelease/Basic.java	Thu Aug 18 13:19:38 2016 +0300
+++ b/jdk/test/tools/jar/multiRelease/Basic.java	Fri Aug 19 10:09:53 2016 -0400
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /test/lib/share/classes
+ * @library /test/lib
  * @modules java.base/jdk.internal.misc
  * @build jdk.test.lib.JDKToolFinder jdk.test.lib.Platform
  * @run testng Basic