diff --git a/hotspot/test/TEST.ROOT b/hotspot/test/TEST.ROOT
index c88dcf29558..55ec2d61184 100644
--- a/hotspot/test/TEST.ROOT
+++ b/hotspot/test/TEST.ROOT
@@ -37,3 +37,7 @@ requires.extraPropDefns = ../../test/jtreg-ext/requires/VMProps.java
 requires.properties=sun.arch.data.model \
     vm.flavor \
     vm.bits
+
+# Path to libraries in the topmost test directory. This is needed so @library
+# does not need ../../ notation to reach them
+external.lib.roots = ../../
diff --git a/jdk/test/TEST.ROOT b/jdk/test/TEST.ROOT
index 355b251e66c..b2d2ba1bcc3 100644
--- a/jdk/test/TEST.ROOT
+++ b/jdk/test/TEST.ROOT
@@ -25,3 +25,7 @@ requires.properties=sun.arch.data.model
 
 # Group definitions
 groups=TEST.groups [closed/TEST.groups]
+
+# Path to libraries in the topmost test directory. This is needed so @library
+# does not need ../../ notation to reach them
+external.lib.roots = ../../
diff --git a/jdk/test/java/net/MulticastSocket/JoinLeave.java b/jdk/test/java/net/MulticastSocket/JoinLeave.java
index 684dd1ebd21..a3e714eecb1 100644
--- a/jdk/test/java/net/MulticastSocket/JoinLeave.java
+++ b/jdk/test/java/net/MulticastSocket/JoinLeave.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 4091811 4148753 4102731
  * @summary Test java.net.MulticastSocket joinGroup and leaveGroup
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.NetworkConfiguration
  *        jdk.test.lib.Platform
  * @run main JoinLeave
diff --git a/jdk/test/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java b/jdk/test/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java
index 50f09885d05..7e888d31d22 100644
--- a/jdk/test/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java
+++ b/jdk/test/java/net/MulticastSocket/SetGetNetworkInterfaceTest.java
@@ -32,7 +32,7 @@
  * @test
  * @bug 6458027
  * @summary Disabling IPv6 on a specific network interface causes problems.
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.NetworkConfiguration
  *        jdk.test.lib.Platform
  * @run main SetGetNetworkInterfaceTest
diff --git a/jdk/test/java/net/MulticastSocket/Test.java b/jdk/test/java/net/MulticastSocket/Test.java
index 63629e0dd90..df72cdae1f9 100644
--- a/jdk/test/java/net/MulticastSocket/Test.java
+++ b/jdk/test/java/net/MulticastSocket/Test.java
@@ -34,7 +34,7 @@
  * @test
  * @bug 4488458
  * @summary IPv4 and IPv6 multicasting broken on Linux
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.NetworkConfiguration
  *        jdk.test.lib.Platform
  * @run main Test
diff --git a/jdk/test/java/net/MulticastSocket/TestInterfaces.java b/jdk/test/java/net/MulticastSocket/TestInterfaces.java
index b8165535110..5a82fb9bed1 100644
--- a/jdk/test/java/net/MulticastSocket/TestInterfaces.java
+++ b/jdk/test/java/net/MulticastSocket/TestInterfaces.java
@@ -26,7 +26,7 @@
  * @bug 4422122
  * @summary Test that MulticastSocket.getInterface returns the
  *          same InetAddress set by MulticastSocket.setInterface
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.NetworkConfiguration
  *        jdk.test.lib.Platform
  * @run main TestInterfaces
diff --git a/jdk/test/java/security/SignedObject/Chain.java b/jdk/test/java/security/SignedObject/Chain.java
index ff922ba8ade..cbd98c06ec8 100644
--- a/jdk/test/java/security/SignedObject/Chain.java
+++ b/jdk/test/java/security/SignedObject/Chain.java
@@ -37,7 +37,7 @@
  * @test
  * @bug 8050374 8181048 8146293
  * @summary Verify a chain of signed objects
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.SigTestUtil
  * @run main Chain
  */
diff --git a/jdk/test/java/util/Arrays/TimSortStackSize2.java b/jdk/test/java/util/Arrays/TimSortStackSize2.java
index dbd0c3c7874..ea0a69f48d0 100644
--- a/jdk/test/java/util/Arrays/TimSortStackSize2.java
+++ b/jdk/test/java/util/Arrays/TimSortStackSize2.java
@@ -26,7 +26,7 @@
  * @bug 8072909
  * @summary Test TimSort stack size on big arrays
  * @key intermittent
- * @library /lib/testlibrary /lib
+ * @library /lib/testlibrary /test/lib
  * @build jdk.testlibrary.*
  * @build TimSortStackSize2
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
diff --git a/jdk/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java b/jdk/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java
index 7e5c2d626df..ccf3ad6b534 100644
--- a/jdk/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java
+++ b/jdk/test/javax/net/ssl/TLS/TLSRehandshakeWithCipherChangeTest.java
@@ -27,7 +27,7 @@
  * @summary Testing TLS engines re-handshaking with cipher change. New cipher
  *          is taken randomly from the supporetd ciphers list.
  * @key randomness
- * @library /sun/security/krb5/auto /lib /javax/net/ssl/TLSCommon
+ * @library /sun/security/krb5/auto /test/lib /javax/net/ssl/TLSCommon
  * @build jdk.test.lib.RandomFactory
  * @run main/othervm -Dtest.security.protocol=TLS TLSRehandshakeWithCipherChangeTest
  */
diff --git a/jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java b/jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java
index 2c82691df4f..5ad80501a65 100644
--- a/jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java
+++ b/jdk/test/javax/net/ssl/TLSv1/TLSRehandshakeWithCipherChangeTest.java
@@ -27,7 +27,7 @@
  * @summary Testing TLS engines re-handshaking with cipher change. New cipher
  *          is taken randomly from the supporetd ciphers list.
  * @key randomness
- * @library /sun/security/krb5/auto /lib /javax/net/ssl/TLSCommon
+ * @library /sun/security/krb5/auto /test/lib /javax/net/ssl/TLSCommon
  * @build jdk.test.lib.RandomFactory
  * @run main/othervm -Dtest.security.protocol=TLSv1 TLSRehandshakeWithCipherChangeTest
  */
diff --git a/jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java b/jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java
index d55581a6744..ee7ef58002c 100644
--- a/jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java
+++ b/jdk/test/javax/net/ssl/TLSv11/TLSRehandshakeWithCipherChangeTest.java
@@ -27,7 +27,7 @@
  * @summary Testing TLS engines re-handshaking with cipher change. New cipher
  *          is taken randomly from the supporetd ciphers list.
  * @key randomness
- * @library /sun/security/krb5/auto /lib /javax/net/ssl/TLSCommon
+ * @library /sun/security/krb5/auto /test/lib /javax/net/ssl/TLSCommon
  * @build jdk.test.lib.RandomFactory
  * @run main/othervm -Dtest.security.protocol=TLSv1.1 TLSRehandshakeWithCipherChangeTest
  */
diff --git a/jdk/test/jdk/internal/platform/cgroup/TestCgroupMetrics.java b/jdk/test/jdk/internal/platform/cgroup/TestCgroupMetrics.java
index f20e222fce3..c6bdaf18232 100644
--- a/jdk/test/jdk/internal/platform/cgroup/TestCgroupMetrics.java
+++ b/jdk/test/jdk/internal/platform/cgroup/TestCgroupMetrics.java
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /lib /
+ * @library /test/lib /
  * @run main TestCgroupMetrics
  */
 
diff --git a/jdk/test/jdk/internal/platform/cgroup/TestCgroupSubsystemController.java b/jdk/test/jdk/internal/platform/cgroup/TestCgroupSubsystemController.java
index f8d85510c5f..9a41d7d4264 100644
--- a/jdk/test/jdk/internal/platform/cgroup/TestCgroupSubsystemController.java
+++ b/jdk/test/jdk/internal/platform/cgroup/TestCgroupSubsystemController.java
@@ -45,7 +45,7 @@
  * @test
  * @requires os.family == "linux"
  * @modules java.base/jdk.internal.platform
- * @library /lib
+ * @library /test/lib
  * @library /lib/testlibrary
  * @run junit/othervm TestCgroupSubsystemController
  */
diff --git a/jdk/test/jdk/internal/platform/docker/TestDockerBasic.java b/jdk/test/jdk/internal/platform/docker/TestDockerBasic.java
index 7746d08c9a5..98de34a545d 100644
--- a/jdk/test/jdk/internal/platform/docker/TestDockerBasic.java
+++ b/jdk/test/jdk/internal/platform/docker/TestDockerBasic.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8293540
  * @summary Verify that -XshowSettings:system works
- * @library /lib /
+ * @library /test/lib /
  * @run main/timeout=360 TestDockerBasic
  */
 
diff --git a/jdk/test/jdk/internal/platform/docker/TestDockerCpuMetrics.java b/jdk/test/jdk/internal/platform/docker/TestDockerCpuMetrics.java
index 7d5305cb0d2..05e52bd19cf 100644
--- a/jdk/test/jdk/internal/platform/docker/TestDockerCpuMetrics.java
+++ b/jdk/test/jdk/internal/platform/docker/TestDockerCpuMetrics.java
@@ -33,7 +33,7 @@
 /*
  * @test
  * @summary Test JDK Metrics class when running inside docker container
- * @library /lib /
+ * @library /test/lib /
  * @build MetricsCpuTester
  * @run main/timeout=360 TestDockerCpuMetrics
  */
diff --git a/jdk/test/jdk/internal/platform/docker/TestDockerMemoryMetrics.java b/jdk/test/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
index 185fe1ed15e..9b05e42928c 100644
--- a/jdk/test/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
+++ b/jdk/test/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
@@ -31,7 +31,7 @@
 /*
  * @test
  * @summary Test JDK Metrics class when running inside docker container
- * @library /lib /
+ * @library /test/lib /
  * @build MetricsMemoryTester
  * @run main/timeout=360 TestDockerMemoryMetrics
  */
diff --git a/jdk/test/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java b/jdk/test/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
index 33022f8b89d..b9c56bcbf24 100644
--- a/jdk/test/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
+++ b/jdk/test/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8242480
- * @library /lib
+ * @library /test/lib
  * @build GetFreeSwapSpaceSize
  * @run driver TestGetFreeSwapSpaceSize
  */
diff --git a/jdk/test/jdk/internal/platform/docker/TestSystemMetrics.java b/jdk/test/jdk/internal/platform/docker/TestSystemMetrics.java
index 1c89639803b..1c1129e35b2 100644
--- a/jdk/test/jdk/internal/platform/docker/TestSystemMetrics.java
+++ b/jdk/test/jdk/internal/platform/docker/TestSystemMetrics.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary Test JDK Metrics class when running inside docker container
- * @library /lib
+ * @library /test/lib
  * @run main TestSystemMetrics
  */
 
diff --git a/jdk/test/jdk/internal/platform/docker/TestUseContainerSupport.java b/jdk/test/jdk/internal/platform/docker/TestUseContainerSupport.java
index f205e74ee5a..c35a407687e 100644
--- a/jdk/test/jdk/internal/platform/docker/TestUseContainerSupport.java
+++ b/jdk/test/jdk/internal/platform/docker/TestUseContainerSupport.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @summary UseContainerSupport flag should reflect Metrics being available
- * @library /lib
+ * @library /test/lib
  * @build CheckUseContainerSupport
  * @run main/timeout=360 TestUseContainerSupport
  */
diff --git a/jdk/test/jdk/jfr/api/consumer/TestFieldAccess.java b/jdk/test/jdk/jfr/api/consumer/TestFieldAccess.java
index a545bf9c264..481506957fc 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestFieldAccess.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestFieldAccess.java
@@ -39,7 +39,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestFieldAccess
  */
 public class TestFieldAccess {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestGetStackTrace.java b/jdk/test/jdk/jfr/api/consumer/TestGetStackTrace.java
index 93a10c8f1ea..cd0b80d140e 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestGetStackTrace.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestGetStackTrace.java
@@ -47,7 +47,7 @@
  * @summary Verifies that a recorded JFR event has the correct stack trace info
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestGetStackTrace
  */
 public class TestGetStackTrace {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestHiddenMethod.java b/jdk/test/jdk/jfr/api/consumer/TestHiddenMethod.java
index e1bdc54668e..2af17251cf4 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestHiddenMethod.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestHiddenMethod.java
@@ -47,7 +47,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
 
  *
diff --git a/jdk/test/jdk/jfr/api/consumer/TestMethodGetModifiers.java b/jdk/test/jdk/jfr/api/consumer/TestMethodGetModifiers.java
index 0d375f0d3ee..e6b97196dc0 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestMethodGetModifiers.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestMethodGetModifiers.java
@@ -43,7 +43,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Xint jdk.jfr.api.consumer.TestMethodGetModifiers
  */
 public final class TestMethodGetModifiers {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestReadTwice.java b/jdk/test/jdk/jfr/api/consumer/TestReadTwice.java
index aa07d854b6d..0a54017b724 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestReadTwice.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestReadTwice.java
@@ -43,7 +43,7 @@
  * @summary Reads the recorded file two times and verifies that both reads are the same
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestReadTwice
  */
 public class TestReadTwice {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordedClassLoader.java b/jdk/test/jdk/jfr/api/consumer/TestRecordedClassLoader.java
index 784867025ee..365508d54c6 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordedClassLoader.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordedClassLoader.java
@@ -41,7 +41,7 @@
  * @summary Verifies the methods of the RecordedClassLoader
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedClassLoader
  */
 public class TestRecordedClassLoader {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordedEvent.java b/jdk/test/jdk/jfr/api/consumer/TestRecordedEvent.java
index c59cf7faf42..ad8a3c68871 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordedEvent.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordedEvent.java
@@ -42,7 +42,7 @@
  * @summary Verifies the methods of the RecordedEvent
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedEvent
  */
 public class TestRecordedEvent {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordedEventGetThread.java b/jdk/test/jdk/jfr/api/consumer/TestRecordedEventGetThread.java
index 7b9ab8f1ac6..2b2074302fe 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordedEventGetThread.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordedEventGetThread.java
@@ -39,7 +39,7 @@
  * @summary Tests that the RecordedEvent.getThread() returns th expected info
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedEventGetThread
  */
 public class TestRecordedEventGetThread {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordedEventGetThreadOther.java b/jdk/test/jdk/jfr/api/consumer/TestRecordedEventGetThreadOther.java
index f555d40f103..550f87ec8bd 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordedEventGetThreadOther.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordedEventGetThreadOther.java
@@ -41,7 +41,7 @@
  * @summary Tests that the RecordedEvent.getThread() returns th expected info
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedEventGetThreadOther
  */
 public class TestRecordedEventGetThreadOther {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordedFrame.java b/jdk/test/jdk/jfr/api/consumer/TestRecordedFrame.java
index 57ee9e949af..5453a972cf5 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordedFrame.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordedFrame.java
@@ -42,7 +42,7 @@
  * @summary Simple test for RecordedFrame APIs
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Xint  -XX:+UseInterpreter -Dinterpreted=true  jdk.jfr.api.consumer.TestRecordedFrame
  * @run main/othervm -Xcomp -XX:-UseInterpreter -Dinterpreted=false jdk.jfr.api.consumer.TestRecordedFrame
  */
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java b/jdk/test/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java
index 2fc846a698e..9ed25dad752 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordedFullStackTrace.java
@@ -44,7 +44,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedFullStackTrace
  */
 public class TestRecordedFullStackTrace {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordedInstantEventTimestamp.java b/jdk/test/jdk/jfr/api/consumer/TestRecordedInstantEventTimestamp.java
index 8a5bb1079ba..a5498824266 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordedInstantEventTimestamp.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordedInstantEventTimestamp.java
@@ -38,7 +38,7 @@
  * @summary Tests that an instant event gets recorded with its start time equal to its end time
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedInstantEventTimestamp
  */
 public class TestRecordedInstantEventTimestamp {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordedMethodDescriptor.java b/jdk/test/jdk/jfr/api/consumer/TestRecordedMethodDescriptor.java
index 77d3df60797..a3b4cdc871c 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordedMethodDescriptor.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordedMethodDescriptor.java
@@ -44,7 +44,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedMethodDescriptor
  */
 public final class TestRecordedMethodDescriptor {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordedObject.java b/jdk/test/jdk/jfr/api/consumer/TestRecordedObject.java
index 6b30e69bb81..992ea2d180f 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordedObject.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordedObject.java
@@ -52,7 +52,7 @@
  * @summary Verifies the methods of the RecordedObject
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedObject
  */
 public class TestRecordedObject {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordedThreadGroupParent.java b/jdk/test/jdk/jfr/api/consumer/TestRecordedThreadGroupParent.java
index dc110d31028..b5f30d3a204 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordedThreadGroupParent.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordedThreadGroupParent.java
@@ -38,7 +38,7 @@
  * @summary Tests getParent method in RecordedThreadGroup
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordedThreadGroupParent
  */
 public class TestRecordedThreadGroupParent {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordingFile.java b/jdk/test/jdk/jfr/api/consumer/TestRecordingFile.java
index 831292641aa..2fffdebe285 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordingFile.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordingFile.java
@@ -54,7 +54,7 @@
  * @summary Verifies that all methods in RecordingFIle are working
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordingFile
  */
 public class TestRecordingFile {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordingFileReadEventEof.java b/jdk/test/jdk/jfr/api/consumer/TestRecordingFileReadEventEof.java
index 83e1aff4cd6..f22ea95ca58 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordingFileReadEventEof.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordingFileReadEventEof.java
@@ -38,7 +38,7 @@
  * @summary Verifies that RecordingFile.readEvent() throws EOF when past the last record
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordingFileReadEventEof
  */
 public class TestRecordingFileReadEventEof {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestRecordingInternals.java b/jdk/test/jdk/jfr/api/consumer/TestRecordingInternals.java
index 232078deed6..ed873bb3d83 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestRecordingInternals.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestRecordingInternals.java
@@ -37,7 +37,7 @@
  * @summary Tests that chunks are read in order and constant pools from multiple chunks can be read
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestRecordingInternals
  */
 public class TestRecordingInternals {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestSingleRecordedEvent.java b/jdk/test/jdk/jfr/api/consumer/TestSingleRecordedEvent.java
index d1a79b33414..7ce0b69cb55 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestSingleRecordedEvent.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestSingleRecordedEvent.java
@@ -39,7 +39,7 @@
  * @summary Verifies that a single JFR event is recorded as expected
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestSingleRecordedEvent
  */
 public class TestSingleRecordedEvent {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestToString.java b/jdk/test/jdk/jfr/api/consumer/TestToString.java
index 66595d71dfe..91234a49b10 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestToString.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestToString.java
@@ -39,7 +39,7 @@
  * @summary Sanity checks that RecordedEvent#toString returns something valid
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.consumer.TestToString
  */
 public class TestToString {
diff --git a/jdk/test/jdk/jfr/api/consumer/TestValueDescriptorRecorded.java b/jdk/test/jdk/jfr/api/consumer/TestValueDescriptorRecorded.java
index fc69f999224..b70fc41a2cf 100644
--- a/jdk/test/jdk/jfr/api/consumer/TestValueDescriptorRecorded.java
+++ b/jdk/test/jdk/jfr/api/consumer/TestValueDescriptorRecorded.java
@@ -42,7 +42,7 @@
  * @summary Verifies that the recorded value descriptors are correct
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm  jdk.jfr.api.consumer.TestValueDescriptorRecorded
  */
 public class TestValueDescriptorRecorded {
diff --git a/jdk/test/jdk/jfr/api/event/TestAbstractEvent.java b/jdk/test/jdk/jfr/api/event/TestAbstractEvent.java
index af276032789..bedba7f467d 100644
--- a/jdk/test/jdk/jfr/api/event/TestAbstractEvent.java
+++ b/jdk/test/jdk/jfr/api/event/TestAbstractEvent.java
@@ -42,7 +42,7 @@
  * @summary Tests that abstract events are not part of metadata
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestAbstractEvent
  * @run main/othervm -XX:+AllowParallelDefineClass jdk.jfr.api.event.TestAbstractEvent
  */
diff --git a/jdk/test/jdk/jfr/api/event/TestBeginEnd.java b/jdk/test/jdk/jfr/api/event/TestBeginEnd.java
index 21817d246b9..077e8b8cc00 100644
--- a/jdk/test/jdk/jfr/api/event/TestBeginEnd.java
+++ b/jdk/test/jdk/jfr/api/event/TestBeginEnd.java
@@ -37,7 +37,7 @@
  * @summary Test for RecordedEvent.getDuration()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestBeginEnd
  */
 public class TestBeginEnd {
diff --git a/jdk/test/jdk/jfr/api/event/TestClinitRegistration.java b/jdk/test/jdk/jfr/api/event/TestClinitRegistration.java
index db4319079fd..fe627318df8 100644
--- a/jdk/test/jdk/jfr/api/event/TestClinitRegistration.java
+++ b/jdk/test/jdk/jfr/api/event/TestClinitRegistration.java
@@ -42,7 +42,7 @@
  * @summary Test enable/disable event and verify recording has expected events.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestClinitRegistration
  */
 
diff --git a/jdk/test/jdk/jfr/api/event/TestClonedEvent.java b/jdk/test/jdk/jfr/api/event/TestClonedEvent.java
index ba43b878c76..6314e7ffb52 100644
--- a/jdk/test/jdk/jfr/api/event/TestClonedEvent.java
+++ b/jdk/test/jdk/jfr/api/event/TestClonedEvent.java
@@ -40,7 +40,7 @@
  * @summary Tests that a cloned event can be successfully committed.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestClonedEvent
  */
 
diff --git a/jdk/test/jdk/jfr/api/event/TestEnableDisable.java b/jdk/test/jdk/jfr/api/event/TestEnableDisable.java
index afde6a0b20d..1ac248d9dc4 100644
--- a/jdk/test/jdk/jfr/api/event/TestEnableDisable.java
+++ b/jdk/test/jdk/jfr/api/event/TestEnableDisable.java
@@ -41,7 +41,7 @@
  * @summary Test enable/disable event and verify recording has expected events.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestEnableDisable
  */
 
diff --git a/jdk/test/jdk/jfr/api/event/TestEventFactory.java b/jdk/test/jdk/jfr/api/event/TestEventFactory.java
index 60b2f905150..781103d36a6 100644
--- a/jdk/test/jdk/jfr/api/event/TestEventFactory.java
+++ b/jdk/test/jdk/jfr/api/event/TestEventFactory.java
@@ -42,7 +42,7 @@
  * @summary EventFactory simple test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestEventFactory
  * @run main/othervm -XX:+AllowParallelDefineClass jdk.jfr.api.event.TestEventFactory
  */
diff --git a/jdk/test/jdk/jfr/api/event/TestEventFactoryRegisterTwice.java b/jdk/test/jdk/jfr/api/event/TestEventFactoryRegisterTwice.java
index f094a47ff24..434f32bb133 100644
--- a/jdk/test/jdk/jfr/api/event/TestEventFactoryRegisterTwice.java
+++ b/jdk/test/jdk/jfr/api/event/TestEventFactoryRegisterTwice.java
@@ -38,7 +38,7 @@
  * @summary Verifies that EventFactory can register the same event twice
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestEventFactoryRegisterTwice
  */
 public class TestEventFactoryRegisterTwice {
diff --git a/jdk/test/jdk/jfr/api/event/TestEventFactoryRegistration.java b/jdk/test/jdk/jfr/api/event/TestEventFactoryRegistration.java
index 7d7c6890e44..8896ffcd2cc 100644
--- a/jdk/test/jdk/jfr/api/event/TestEventFactoryRegistration.java
+++ b/jdk/test/jdk/jfr/api/event/TestEventFactoryRegistration.java
@@ -42,7 +42,7 @@
  * @summary EventFactory register/unregister API test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestEventFactoryRegistration
  * @run main/othervm -XX:+AllowParallelDefineClass jdk.jfr.api.event.TestEventFactoryRegistration
  */
diff --git a/jdk/test/jdk/jfr/api/event/TestExtends.java b/jdk/test/jdk/jfr/api/event/TestExtends.java
index 765be919016..d05e41418e2 100644
--- a/jdk/test/jdk/jfr/api/event/TestExtends.java
+++ b/jdk/test/jdk/jfr/api/event/TestExtends.java
@@ -38,7 +38,7 @@
  * @summary Test with event class inheritance
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestExtends
  */
 
diff --git a/jdk/test/jdk/jfr/api/event/TestGetDuration.java b/jdk/test/jdk/jfr/api/event/TestGetDuration.java
index ac3db2d5d78..449b166f000 100644
--- a/jdk/test/jdk/jfr/api/event/TestGetDuration.java
+++ b/jdk/test/jdk/jfr/api/event/TestGetDuration.java
@@ -41,7 +41,7 @@
  * @summary Test for RecordedEvent.getDuration()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestGetDuration
  */
 public class TestGetDuration {
diff --git a/jdk/test/jdk/jfr/api/event/TestIsEnabled.java b/jdk/test/jdk/jfr/api/event/TestIsEnabled.java
index c11d2125c7f..b245fca3c0c 100644
--- a/jdk/test/jdk/jfr/api/event/TestIsEnabled.java
+++ b/jdk/test/jdk/jfr/api/event/TestIsEnabled.java
@@ -35,7 +35,7 @@
  * @summary Test Event.isEnabled()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestIsEnabled
  */
 
diff --git a/jdk/test/jdk/jfr/api/event/TestIsEnabledMultiple.java b/jdk/test/jdk/jfr/api/event/TestIsEnabledMultiple.java
index 4ceec8e7b21..345de5ebb18 100644
--- a/jdk/test/jdk/jfr/api/event/TestIsEnabledMultiple.java
+++ b/jdk/test/jdk/jfr/api/event/TestIsEnabledMultiple.java
@@ -35,7 +35,7 @@
  * @summary Test Event.isEnabled() with multiple recordings
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestIsEnabledMultiple
  */
 
diff --git a/jdk/test/jdk/jfr/api/event/TestOwnCommit.java b/jdk/test/jdk/jfr/api/event/TestOwnCommit.java
index 786b0da20f0..370362223f1 100644
--- a/jdk/test/jdk/jfr/api/event/TestOwnCommit.java
+++ b/jdk/test/jdk/jfr/api/event/TestOwnCommit.java
@@ -39,7 +39,7 @@
  * @summary Use custom event that reuse method names begin, end and commit.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestOwnCommit
  */
 
diff --git a/jdk/test/jdk/jfr/api/event/TestShouldCommit.java b/jdk/test/jdk/jfr/api/event/TestShouldCommit.java
index 7497c6a4512..8cc04dc927b 100644
--- a/jdk/test/jdk/jfr/api/event/TestShouldCommit.java
+++ b/jdk/test/jdk/jfr/api/event/TestShouldCommit.java
@@ -36,7 +36,7 @@
  * @summary Test enable/disable event and verify recording has expected events.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+LogJFR jdk.jfr.api.event.TestShouldCommit
  */
 
diff --git a/jdk/test/jdk/jfr/api/event/TestStaticEnable.java b/jdk/test/jdk/jfr/api/event/TestStaticEnable.java
index c3e4c7a43b6..b2976d75e06 100644
--- a/jdk/test/jdk/jfr/api/event/TestStaticEnable.java
+++ b/jdk/test/jdk/jfr/api/event/TestStaticEnable.java
@@ -38,7 +38,7 @@
  * @summary Enable an event from a static function in the event.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.TestStaticEnable
  */
 public class TestStaticEnable {
diff --git a/jdk/test/jdk/jfr/api/event/dynamic/TestDynamicAnnotations.java b/jdk/test/jdk/jfr/api/event/dynamic/TestDynamicAnnotations.java
index edb0b88b877..11bddf2975f 100644
--- a/jdk/test/jdk/jfr/api/event/dynamic/TestDynamicAnnotations.java
+++ b/jdk/test/jdk/jfr/api/event/dynamic/TestDynamicAnnotations.java
@@ -55,7 +55,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.dynamic.TestDynamicAnnotations
  */
 public class TestDynamicAnnotations {
diff --git a/jdk/test/jdk/jfr/api/event/dynamic/TestEventFactory.java b/jdk/test/jdk/jfr/api/event/dynamic/TestEventFactory.java
index ef3957f9a06..4caefe6f6c8 100644
--- a/jdk/test/jdk/jfr/api/event/dynamic/TestEventFactory.java
+++ b/jdk/test/jdk/jfr/api/event/dynamic/TestEventFactory.java
@@ -57,7 +57,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.event.dynamic.TestEventFactory
  */
 public class TestEventFactory {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestAddListenerTwice.java b/jdk/test/jdk/jfr/api/flightrecorder/TestAddListenerTwice.java
index 07429a0dfce..ef1e086d3aa 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestAddListenerTwice.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestAddListenerTwice.java
@@ -33,7 +33,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestAddListenerTwice
  */
 public class TestAddListenerTwice {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestAddPeriodicEvent.java b/jdk/test/jdk/jfr/api/flightrecorder/TestAddPeriodicEvent.java
index a1b8285c84f..8654484bae9 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestAddPeriodicEvent.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestAddPeriodicEvent.java
@@ -40,7 +40,7 @@
  * @summary
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestAddPeriodicEvent
  */
 public class TestAddPeriodicEvent {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestFlightRecorderListenerRecorderInitialized.java b/jdk/test/jdk/jfr/api/flightrecorder/TestFlightRecorderListenerRecorderInitialized.java
index fcbf2cc61dd..4f3e9197352 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestFlightRecorderListenerRecorderInitialized.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestFlightRecorderListenerRecorderInitialized.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestFlightRecorderListenerRecorderInitialized
  */
 public class TestFlightRecorderListenerRecorderInitialized {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestGetEventTypes.java b/jdk/test/jdk/jfr/api/flightrecorder/TestGetEventTypes.java
index fb4c8727a07..c2b7ed8f5e8 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestGetEventTypes.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestGetEventTypes.java
@@ -42,7 +42,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm/timeout=600 jdk.jfr.api.flightrecorder.TestGetEventTypes
  */
 public class TestGetEventTypes {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestGetPlatformRecorder.java b/jdk/test/jdk/jfr/api/flightrecorder/TestGetPlatformRecorder.java
index a6843734be8..ea143fbe055 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestGetPlatformRecorder.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestGetPlatformRecorder.java
@@ -33,7 +33,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestGetPlatformRecorder
  */
 public class TestGetPlatformRecorder {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestGetRecordings.java b/jdk/test/jdk/jfr/api/flightrecorder/TestGetRecordings.java
index 375d6827bb5..bb42d772c1f 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestGetRecordings.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestGetRecordings.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestGetRecordings
  */
 public class TestGetRecordings {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestGetSettings.java b/jdk/test/jdk/jfr/api/flightrecorder/TestGetSettings.java
index a5dbee5e411..83d92edb6ad 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestGetSettings.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestGetSettings.java
@@ -39,7 +39,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestGetSettings
  */
 public class TestGetSettings {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestIsAvailable.java b/jdk/test/jdk/jfr/api/flightrecorder/TestIsAvailable.java
index a1973ea44d7..e2e844e74ba 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestIsAvailable.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestIsAvailable.java
@@ -32,7 +32,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+FlightRecorder jdk.jfr.api.flightrecorder.TestIsAvailable true
  * @run main/othervm -XX:-FlightRecorder jdk.jfr.api.flightrecorder.TestIsAvailable  false
  * @run main/othervm jdk.jfr.api.flightrecorder.TestIsAvailable true
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestIsInitialized.java b/jdk/test/jdk/jfr/api/flightrecorder/TestIsInitialized.java
index 4ce14b827c1..3461cc0b66e 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestIsInitialized.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestIsInitialized.java
@@ -33,7 +33,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestIsInitialized
  */
 public class TestIsInitialized {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestListener.java b/jdk/test/jdk/jfr/api/flightrecorder/TestListener.java
index 56aed2dad5d..1d9e1fcffec 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestListener.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestListener.java
@@ -33,7 +33,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestListener
  */
 public class TestListener {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestListenerNull.java b/jdk/test/jdk/jfr/api/flightrecorder/TestListenerNull.java
index 650b99cafa5..96ad3d35c83 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestListenerNull.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestListenerNull.java
@@ -33,7 +33,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestListenerNull
  */
 public class TestListenerNull {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestPeriodicEventsSameHook.java b/jdk/test/jdk/jfr/api/flightrecorder/TestPeriodicEventsSameHook.java
index 236c08206d7..f691f97dd26 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestPeriodicEventsSameHook.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestPeriodicEventsSameHook.java
@@ -33,7 +33,7 @@
  * @summary Check that an IllegalArgumentException is thrown if event is added twice
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestPeriodicEventsSameHook
  */
 public class TestPeriodicEventsSameHook {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestRecorderInitializationCallback.java b/jdk/test/jdk/jfr/api/flightrecorder/TestRecorderInitializationCallback.java
index 7d616dcf3cc..6bbff331ddd 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestRecorderInitializationCallback.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestRecorderInitializationCallback.java
@@ -37,7 +37,7 @@
  * @summary Test Flight Recorder initialization callback is only called once
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestRecorderInitializationCallback
  */
 public class TestRecorderInitializationCallback {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestRegisterUnregisterEvent.java b/jdk/test/jdk/jfr/api/flightrecorder/TestRegisterUnregisterEvent.java
index 4a9536534d0..3e473230587 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestRegisterUnregisterEvent.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestRegisterUnregisterEvent.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestRegisterUnregisterEvent
  */
 public class TestRegisterUnregisterEvent {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestSettingsControl.java b/jdk/test/jdk/jfr/api/flightrecorder/TestSettingsControl.java
index 49d1d6fe7ed..dd298cdde98 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestSettingsControl.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestSettingsControl.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestSettingsControl
  */
 public class TestSettingsControl {
diff --git a/jdk/test/jdk/jfr/api/flightrecorder/TestSnapshot.java b/jdk/test/jdk/jfr/api/flightrecorder/TestSnapshot.java
index 86ad2eb93e0..7427fff8c56 100644
--- a/jdk/test/jdk/jfr/api/flightrecorder/TestSnapshot.java
+++ b/jdk/test/jdk/jfr/api/flightrecorder/TestSnapshot.java
@@ -44,7 +44,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.flightrecorder.TestSnapshot
  */
 public class TestSnapshot {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestCategory.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestCategory.java
index 1ed6ed69996..8bc69602dbe 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestCategory.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestCategory.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestCategory
  */
 public class TestCategory {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestContentType.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestContentType.java
index ea989a47840..1924d03cf08 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestContentType.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestContentType.java
@@ -43,7 +43,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestContentType
  */
 public class TestContentType {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestDescription.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestDescription.java
index 8c00eac2917..e6d7dc7b9ad 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestDescription.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestDescription.java
@@ -45,7 +45,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestDescription
  */
 public class TestDescription {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestDynamicAnnotation.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestDynamicAnnotation.java
index 7fd46f72311..f3a2c36a9cd 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestDynamicAnnotation.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestDynamicAnnotation.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestDynamicAnnotation
  */
 
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestEnabled.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestEnabled.java
index 7e53e2688e0..de0a7b38af9 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestEnabled.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestEnabled.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestEnabled
  */
 public class TestEnabled {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestExperimental.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestExperimental.java
index 78b9a195a98..792cd954b82 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestExperimental.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestExperimental.java
@@ -42,7 +42,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestExperimental
  */
 public class TestExperimental {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestFieldAnnotations.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestFieldAnnotations.java
index 6f0600abcb5..dabcad55b7e 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestFieldAnnotations.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestFieldAnnotations.java
@@ -43,7 +43,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestFieldAnnotations
  */
 public class TestFieldAnnotations {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestFormatMissingValue.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestFormatMissingValue.java
index a9335cac688..2019284f00a 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestFormatMissingValue.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestFormatMissingValue.java
@@ -39,7 +39,7 @@
  * @key jfr
  * @summary Check that event values are properly formatted and sanity check
  *              that extreme values don't throws exceptions
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestFormatMissingValue
  */
 public class TestFormatMissingValue {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestHasValue.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestHasValue.java
index 3c02323f390..6c75813fcee 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestHasValue.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestHasValue.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestHasValue
  */
 
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestInheritedAnnotations.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestInheritedAnnotations.java
index 943bc27bcc7..d3d6f6675ea 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestInheritedAnnotations.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestInheritedAnnotations.java
@@ -52,7 +52,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestInheritedAnnotations
  */
 public class TestInheritedAnnotations {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestLabel.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestLabel.java
index 89e372a13a7..4d00512df52 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestLabel.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestLabel.java
@@ -46,7 +46,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestLabel
  */
 public class TestLabel {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestMetadata.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestMetadata.java
index 210be81cb4b..52ef756d6fd 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestMetadata.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestMetadata.java
@@ -42,7 +42,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestMetadata
  */
 public class TestMetadata {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestName.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestName.java
index 4d9b08ea8c7..3645b3b294d 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestName.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestName.java
@@ -46,7 +46,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestName
  */
 public class TestName {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestPeriod.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestPeriod.java
index 54ac938edcf..d03f776ee3d 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestPeriod.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestPeriod.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestLabel
  */
 public class TestPeriod {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestRegistered.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestRegistered.java
index 5d6bf80c1bb..aa3f7b7b2a2 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestRegistered.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestRegistered.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestRegistered
  */
 public class TestRegistered {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestRegisteredFalseAndRunning.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestRegisteredFalseAndRunning.java
index fbea9af90b0..bb154eb1d9f 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestRegisteredFalseAndRunning.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestRegisteredFalseAndRunning.java
@@ -33,7 +33,7 @@
  * @test Tests that commit doesn't throw exception when an event has not been registered.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestRegisteredFalseAndRunning
  * @run main/othervm -XX:FlightRecorderOptions=retransform=false jdk.jfr.api.metadata.annotations.TestRegisteredFalseAndRunning
  */
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestRelational.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestRelational.java
index 6360f75b0d9..94406822f01 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestRelational.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestRelational.java
@@ -44,7 +44,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestRelational
  */
 public class TestRelational {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestSimpleMetadataEvent.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestSimpleMetadataEvent.java
index 95150735e66..d928b86ecd8 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestSimpleMetadataEvent.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestSimpleMetadataEvent.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestSimpleMetadataEvent
  */
 public class TestSimpleMetadataEvent {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestStackTrace.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestStackTrace.java
index 23881c89aed..1fabed1c856 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestStackTrace.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestStackTrace.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestStackTrace
  */
 public class TestStackTrace {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestThreshold.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestThreshold.java
index 09310cfc4ab..4ff764d458f 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestThreshold.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestThreshold.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestThreshold
  */
 public class TestThreshold {
diff --git a/jdk/test/jdk/jfr/api/metadata/annotations/TestTypesIdentical.java b/jdk/test/jdk/jfr/api/metadata/annotations/TestTypesIdentical.java
index 594c0a5be62..a6415cd0c33 100644
--- a/jdk/test/jdk/jfr/api/metadata/annotations/TestTypesIdentical.java
+++ b/jdk/test/jdk/jfr/api/metadata/annotations/TestTypesIdentical.java
@@ -55,7 +55,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.annotations.TestTypesIdentical
  */
 public class TestTypesIdentical {
diff --git a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotation.java b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotation.java
index 5ea99efc86c..1031f1ac31e 100644
--- a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotation.java
+++ b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotation.java
@@ -40,7 +40,7 @@
  * @summary Test getAnnotations()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetAnnotation
  */
 public class TestGetAnnotation {
diff --git a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotationElements.java b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotationElements.java
index b5ba7c3577e..637bd2d6de1 100644
--- a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotationElements.java
+++ b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotationElements.java
@@ -67,7 +67,7 @@
  * @summary Test for AnnotationElement.getAnnotationElements()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetAnnotationElements
  */
 public class TestGetAnnotationElements {
diff --git a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotations.java b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotations.java
index 9214b261a73..191e2cda855 100644
--- a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotations.java
+++ b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetAnnotations.java
@@ -42,7 +42,7 @@
  * @summary Test getAnnotations()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetAnnotations
  */
 public class TestGetAnnotations {
diff --git a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetCategory.java b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetCategory.java
index 4fbc9aa2266..6dc49c9c43f 100644
--- a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetCategory.java
+++ b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetCategory.java
@@ -37,7 +37,7 @@
  * @summary Test setName().
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetCategory
  */
 public class TestGetCategory {
diff --git a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetDefaultValues.java b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetDefaultValues.java
index bc4615ebdc1..42a8c61934b 100644
--- a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetDefaultValues.java
+++ b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetDefaultValues.java
@@ -36,7 +36,7 @@
  * @summary Test getDefaultValues()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetDefaultValues
  */
 public class TestGetDefaultValues {
diff --git a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetDescription.java b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetDescription.java
index bc662eb5067..af7098e364e 100644
--- a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetDescription.java
+++ b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetDescription.java
@@ -41,7 +41,7 @@
  * @summary Test descriptive annotations for EventType
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetDescription
  */
 public class TestGetDescription {
diff --git a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetEventType.java b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetEventType.java
index d6240658a27..738ba1e3f41 100644
--- a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetEventType.java
+++ b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetEventType.java
@@ -34,7 +34,7 @@
  * @summary Test getEventType()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetEventType
  */
 public class TestGetEventType {
diff --git a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetField.java b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetField.java
index aec6309e257..d4d4b835c28 100644
--- a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetField.java
+++ b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetField.java
@@ -35,7 +35,7 @@
  * @summary Test getField()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetField
  */
 public class TestGetField {
diff --git a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetFields.java b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetFields.java
index df39699cc88..f1b687eafc3 100644
--- a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetFields.java
+++ b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetFields.java
@@ -38,7 +38,7 @@
  * @summary Test getFields()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetFields
  */
 public class TestGetFields {
diff --git a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetSettings.java b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetSettings.java
index 424b086479c..59289310437 100644
--- a/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetSettings.java
+++ b/jdk/test/jdk/jfr/api/metadata/eventtype/TestGetSettings.java
@@ -36,7 +36,7 @@
  * @summary Test getSettings()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.eventtype.TestGetSettings
  */
 public class TestGetSettings {
diff --git a/jdk/test/jdk/jfr/api/metadata/eventtype/TestUnloadingEventClass.java b/jdk/test/jdk/jfr/api/metadata/eventtype/TestUnloadingEventClass.java
index 167723745e3..7f96639dd5f 100644
--- a/jdk/test/jdk/jfr/api/metadata/eventtype/TestUnloadingEventClass.java
+++ b/jdk/test/jdk/jfr/api/metadata/eventtype/TestUnloadingEventClass.java
@@ -44,7 +44,7 @@
  * @summary Test that verifies event metadata is removed when an event class is unloaded.
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  *
  * @run main/othervm -XX:+PrintGCDetails -XX:+PrintGC  -verbose:class jdk.jfr.api.metadata.eventtype.TestUnloadingEventClass
diff --git a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestDefaultValue.java b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestDefaultValue.java
index f6357441d4e..e36446ec2ef 100644
--- a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestDefaultValue.java
+++ b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestDefaultValue.java
@@ -34,7 +34,7 @@
  * @summary Test SettingDescriptor.getName()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestDefaultValue
  */
 public class TestDefaultValue {
diff --git a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotation.java b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotation.java
index 7b7ce61a33a..b9aa69fc987 100644
--- a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotation.java
+++ b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotation.java
@@ -38,7 +38,7 @@
  * @summary Test SettingDescriptor.getAnnotation();
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetAnnotation
  */
 public class TestGetAnnotation {
diff --git a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotationElement.java b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotationElement.java
index f7e10a15e52..fade2979366 100644
--- a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotationElement.java
+++ b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetAnnotationElement.java
@@ -41,7 +41,7 @@
  * @summary Test SettingDescriptor.getAnnotationElements()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetAnnotationElement
  */
 public class TestGetAnnotationElement {
diff --git a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetContentType.java b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetContentType.java
index 1c5447a3651..c796f94355f 100644
--- a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetContentType.java
+++ b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetContentType.java
@@ -39,7 +39,7 @@
  * @summary Test SettingDescriptor.getContentType()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetDescription
  */
 public class TestGetContentType {
diff --git a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetDescription.java b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetDescription.java
index 8e4758321a3..9a0cb8bba14 100644
--- a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetDescription.java
+++ b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetDescription.java
@@ -36,7 +36,7 @@
  * @summary Test SettingDescriptor.getDescription()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetDescription
  */
 public class TestGetDescription {
diff --git a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetLabel.java b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetLabel.java
index 82e8fec5c0e..7802120d7a1 100644
--- a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetLabel.java
+++ b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetLabel.java
@@ -36,7 +36,7 @@
  * @summary Test SettingDescriptor.getLabel()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetLabel
  */
 public class TestGetLabel {
diff --git a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetName.java b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetName.java
index 80fcebad060..865c020125a 100644
--- a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetName.java
+++ b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetName.java
@@ -33,7 +33,7 @@
  * @summary Test SettingDescriptor.getName()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetName
  */
 public class TestGetName {
diff --git a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeId.java b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeId.java
index 4449b873c99..4e636515974 100644
--- a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeId.java
+++ b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeId.java
@@ -34,7 +34,7 @@
  * @summary Test SettingDescriptor.getTypeId()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetTypeId
  */
 public class TestGetTypeId {
diff --git a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeName.java b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeName.java
index cb241de5491..c0d1233ab9b 100644
--- a/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeName.java
+++ b/jdk/test/jdk/jfr/api/metadata/settingdescriptor/TestGetTypeName.java
@@ -34,7 +34,7 @@
  * @summary Test SettingDescriptor.getTypeName();
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.settingdescriptor.TestGetTypeName
  */
 public class TestGetTypeName {
diff --git a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestClasses.java b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestClasses.java
index 81e70c44b4b..90077f057a2 100644
--- a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestClasses.java
+++ b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestClasses.java
@@ -38,7 +38,7 @@
  * @summary Test ValueDescriptor.getAnnotations()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestClasses
  */
 public class TestClasses {
diff --git a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestConstructor.java b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestConstructor.java
index 336bff2c74c..f7a9f91ec50 100644
--- a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestConstructor.java
+++ b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestConstructor.java
@@ -38,7 +38,7 @@
  * @summary Test ValueDescriptor.getAnnotations()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestConstructor
  */
 public class TestConstructor {
diff --git a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestGetAnnotations.java b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestGetAnnotations.java
index ee11da9a174..82a82e7f215 100644
--- a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestGetAnnotations.java
+++ b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestGetAnnotations.java
@@ -42,7 +42,7 @@
  * @summary Test ValueDescriptor.getAnnotations()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestGetAnnotations
  */
 public class TestGetAnnotations {
diff --git a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestGetFields.java b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestGetFields.java
index 60b4d5411b0..7e07ba35c39 100644
--- a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestGetFields.java
+++ b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestGetFields.java
@@ -33,7 +33,7 @@
  * @summary Test ValueDescriptor.getAnnotations()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestGetFields
  */
 public class TestGetFields {
diff --git a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestIsArray.java b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestIsArray.java
index c5aa3d9e23c..f1b671d1137 100644
--- a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestIsArray.java
+++ b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestIsArray.java
@@ -35,7 +35,7 @@
  * @summary Test ValueDescriptor.isArray().
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestIsArray
  */
 public class TestIsArray {
diff --git a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestSimpleTypes.java b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestSimpleTypes.java
index bdfc30430f2..83296c48f71 100644
--- a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestSimpleTypes.java
+++ b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestSimpleTypes.java
@@ -43,7 +43,7 @@
  * @summary Test all basic types in ValueDescriptor.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestSimpleTypes
  */
 public class TestSimpleTypes {
diff --git a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestValueDescriptorContentType.java b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestValueDescriptorContentType.java
index 1cc6b0e4a93..f74354ee72b 100644
--- a/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestValueDescriptorContentType.java
+++ b/jdk/test/jdk/jfr/api/metadata/valuedescriptor/TestValueDescriptorContentType.java
@@ -42,7 +42,7 @@
  * @summary Test ValueDescriptor.getContentType()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.metadata.valuedescriptor.TestValueDescriptorContentType
  */
 public class TestValueDescriptorContentType {
diff --git a/jdk/test/jdk/jfr/api/recorder/TestRecorderInitialized.java b/jdk/test/jdk/jfr/api/recorder/TestRecorderInitialized.java
index 26d6d249761..5cedc979a62 100644
--- a/jdk/test/jdk/jfr/api/recorder/TestRecorderInitialized.java
+++ b/jdk/test/jdk/jfr/api/recorder/TestRecorderInitialized.java
@@ -33,7 +33,7 @@
  * @test TestRecorderListener
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.api.recorder.TestRecorderInitialized
  */
diff --git a/jdk/test/jdk/jfr/api/recorder/TestStartStopRecording.java b/jdk/test/jdk/jfr/api/recorder/TestStartStopRecording.java
index 421577bc8ec..ad7bf949719 100644
--- a/jdk/test/jdk/jfr/api/recorder/TestStartStopRecording.java
+++ b/jdk/test/jdk/jfr/api/recorder/TestStartStopRecording.java
@@ -39,7 +39,7 @@
  *
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recorder.TestStartStopRecording
  */
 public class TestStartStopRecording {
diff --git a/jdk/test/jdk/jfr/api/recording/destination/TestDestFileExist.java b/jdk/test/jdk/jfr/api/recording/destination/TestDestFileExist.java
index 2476af0fa35..b7964f5c8f6 100644
--- a/jdk/test/jdk/jfr/api/recording/destination/TestDestFileExist.java
+++ b/jdk/test/jdk/jfr/api/recording/destination/TestDestFileExist.java
@@ -43,7 +43,7 @@
  * @summary Set destination to an existing file. File should be overwritten.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestFileExist
  */
 public class TestDestFileExist {
diff --git a/jdk/test/jdk/jfr/api/recording/destination/TestDestFileReadOnly.java b/jdk/test/jdk/jfr/api/recording/destination/TestDestFileReadOnly.java
index 833ec9d5f11..22a798f8a47 100644
--- a/jdk/test/jdk/jfr/api/recording/destination/TestDestFileReadOnly.java
+++ b/jdk/test/jdk/jfr/api/recording/destination/TestDestFileReadOnly.java
@@ -38,7 +38,7 @@
  * @summary Set destination to a read-only file. Expects exception.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestFileReadOnly
  */
 public class TestDestFileReadOnly {
diff --git a/jdk/test/jdk/jfr/api/recording/destination/TestDestInvalid.java b/jdk/test/jdk/jfr/api/recording/destination/TestDestInvalid.java
index 38aab517358..7b5baf597e1 100644
--- a/jdk/test/jdk/jfr/api/recording/destination/TestDestInvalid.java
+++ b/jdk/test/jdk/jfr/api/recording/destination/TestDestInvalid.java
@@ -44,7 +44,7 @@
  * @summary Test setDestination to invalid paths
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestInvalid
  */
 public class TestDestInvalid {
diff --git a/jdk/test/jdk/jfr/api/recording/destination/TestDestLongPath.java b/jdk/test/jdk/jfr/api/recording/destination/TestDestLongPath.java
index b6160629281..02b3f85a96e 100644
--- a/jdk/test/jdk/jfr/api/recording/destination/TestDestLongPath.java
+++ b/jdk/test/jdk/jfr/api/recording/destination/TestDestLongPath.java
@@ -42,7 +42,7 @@
  * @summary Set destination to a long path
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestLongPath
  */
 public class TestDestLongPath {
diff --git a/jdk/test/jdk/jfr/api/recording/destination/TestDestMultiple.java b/jdk/test/jdk/jfr/api/recording/destination/TestDestMultiple.java
index c55a697ded8..d6ef17d4388 100644
--- a/jdk/test/jdk/jfr/api/recording/destination/TestDestMultiple.java
+++ b/jdk/test/jdk/jfr/api/recording/destination/TestDestMultiple.java
@@ -42,7 +42,7 @@
  * @summary Test setDestination with concurrent recordings
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+LogJFR  jdk.jfr.api.recording.destination.TestDestMultiple
  */
 public class TestDestMultiple {
diff --git a/jdk/test/jdk/jfr/api/recording/destination/TestDestReadOnly.java b/jdk/test/jdk/jfr/api/recording/destination/TestDestReadOnly.java
index f49fc38c51e..dea97446891 100644
--- a/jdk/test/jdk/jfr/api/recording/destination/TestDestReadOnly.java
+++ b/jdk/test/jdk/jfr/api/recording/destination/TestDestReadOnly.java
@@ -45,7 +45,7 @@
  * @summary Test setDestination to read-only dir
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestReadOnly
  */
 public class TestDestReadOnly {
diff --git a/jdk/test/jdk/jfr/api/recording/destination/TestDestState.java b/jdk/test/jdk/jfr/api/recording/destination/TestDestState.java
index d22c246aea7..d05aaeaca71 100644
--- a/jdk/test/jdk/jfr/api/recording/destination/TestDestState.java
+++ b/jdk/test/jdk/jfr/api/recording/destination/TestDestState.java
@@ -41,7 +41,7 @@
  * @summary Call setDestination() when recording in different states
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestState
  */
 public class TestDestState {
diff --git a/jdk/test/jdk/jfr/api/recording/destination/TestDestToDiskFalse.java b/jdk/test/jdk/jfr/api/recording/destination/TestDestToDiskFalse.java
index 642c0767fa2..b2dafca6d8d 100644
--- a/jdk/test/jdk/jfr/api/recording/destination/TestDestToDiskFalse.java
+++ b/jdk/test/jdk/jfr/api/recording/destination/TestDestToDiskFalse.java
@@ -44,7 +44,7 @@
  * @summary Basic test for setDestination with disk=false
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestToDiskFalse
  */
 public class TestDestToDiskFalse {
diff --git a/jdk/test/jdk/jfr/api/recording/destination/TestDestToDiskTrue.java b/jdk/test/jdk/jfr/api/recording/destination/TestDestToDiskTrue.java
index 1b87329d17a..e6145867f47 100644
--- a/jdk/test/jdk/jfr/api/recording/destination/TestDestToDiskTrue.java
+++ b/jdk/test/jdk/jfr/api/recording/destination/TestDestToDiskTrue.java
@@ -43,7 +43,7 @@
  * @summary Basic test for setDestination with disk=true
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestToDiskTrue
  */
 public class TestDestToDiskTrue {
diff --git a/jdk/test/jdk/jfr/api/recording/destination/TestDestWithDuration.java b/jdk/test/jdk/jfr/api/recording/destination/TestDestWithDuration.java
index 86f9a2bb3c3..a466f56c88a 100644
--- a/jdk/test/jdk/jfr/api/recording/destination/TestDestWithDuration.java
+++ b/jdk/test/jdk/jfr/api/recording/destination/TestDestWithDuration.java
@@ -44,7 +44,7 @@
  * @summary Test that recording is auto closed after duration
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.destination.TestDestWithDuration
  */
 public class TestDestWithDuration {
diff --git a/jdk/test/jdk/jfr/api/recording/dump/TestDump.java b/jdk/test/jdk/jfr/api/recording/dump/TestDump.java
index 2e1f506d866..a61e318080e 100644
--- a/jdk/test/jdk/jfr/api/recording/dump/TestDump.java
+++ b/jdk/test/jdk/jfr/api/recording/dump/TestDump.java
@@ -39,7 +39,7 @@
  * @summary Test copyTo and parse file
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.dump.TestDump
  */
 public class TestDump {
diff --git a/jdk/test/jdk/jfr/api/recording/dump/TestDumpDevNull.java b/jdk/test/jdk/jfr/api/recording/dump/TestDumpDevNull.java
index 22d89f7f450..76d2b48ffb5 100644
--- a/jdk/test/jdk/jfr/api/recording/dump/TestDumpDevNull.java
+++ b/jdk/test/jdk/jfr/api/recording/dump/TestDumpDevNull.java
@@ -32,7 +32,7 @@
  * @summary Tests that it's possible to dump to /dev/null without a livelock
  * @key jfr
  * @requires (os.family != "windows")
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.dump.TestDumpDevNull
  */
 public class TestDumpDevNull {
diff --git a/jdk/test/jdk/jfr/api/recording/dump/TestDumpInvalid.java b/jdk/test/jdk/jfr/api/recording/dump/TestDumpInvalid.java
index 736037690cb..6c342a1a2d1 100644
--- a/jdk/test/jdk/jfr/api/recording/dump/TestDumpInvalid.java
+++ b/jdk/test/jdk/jfr/api/recording/dump/TestDumpInvalid.java
@@ -42,7 +42,7 @@
  * @summary Test copyTo and parse file
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.dump.TestDumpInvalid
  */
 public class TestDumpInvalid {
diff --git a/jdk/test/jdk/jfr/api/recording/dump/TestDumpLongPath.java b/jdk/test/jdk/jfr/api/recording/dump/TestDumpLongPath.java
index 87bface9d9d..f5bf482400d 100644
--- a/jdk/test/jdk/jfr/api/recording/dump/TestDumpLongPath.java
+++ b/jdk/test/jdk/jfr/api/recording/dump/TestDumpLongPath.java
@@ -42,7 +42,7 @@
  * @summary Test copyTo and parse file
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.dump.TestDumpLongPath
  */
 public class TestDumpLongPath {
diff --git a/jdk/test/jdk/jfr/api/recording/dump/TestDumpMultiple.java b/jdk/test/jdk/jfr/api/recording/dump/TestDumpMultiple.java
index 05343513238..bf324b87b2b 100644
--- a/jdk/test/jdk/jfr/api/recording/dump/TestDumpMultiple.java
+++ b/jdk/test/jdk/jfr/api/recording/dump/TestDumpMultiple.java
@@ -41,7 +41,7 @@
  * @summary Test copyTo and parse file
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.dump.TestDumpMultiple
  */
 public class TestDumpMultiple {
diff --git a/jdk/test/jdk/jfr/api/recording/dump/TestDumpReadOnly.java b/jdk/test/jdk/jfr/api/recording/dump/TestDumpReadOnly.java
index 5a6c35b4634..3148724330b 100644
--- a/jdk/test/jdk/jfr/api/recording/dump/TestDumpReadOnly.java
+++ b/jdk/test/jdk/jfr/api/recording/dump/TestDumpReadOnly.java
@@ -40,7 +40,7 @@
  * @summary Test copyTo and parse file
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.dump.TestDumpReadOnly
  */
 public class TestDumpReadOnly {
diff --git a/jdk/test/jdk/jfr/api/recording/dump/TestDumpState.java b/jdk/test/jdk/jfr/api/recording/dump/TestDumpState.java
index df0e90b1d0b..4e6d9e96056 100644
--- a/jdk/test/jdk/jfr/api/recording/dump/TestDumpState.java
+++ b/jdk/test/jdk/jfr/api/recording/dump/TestDumpState.java
@@ -47,7 +47,7 @@
  * @summary call copyTo() with recording in all states.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.dump.TestDumpState
  */
 public class TestDumpState {
diff --git a/jdk/test/jdk/jfr/api/recording/event/TestChunkPeriod.java b/jdk/test/jdk/jfr/api/recording/event/TestChunkPeriod.java
index 83e48de931c..5125d94a55b 100644
--- a/jdk/test/jdk/jfr/api/recording/event/TestChunkPeriod.java
+++ b/jdk/test/jdk/jfr/api/recording/event/TestChunkPeriod.java
@@ -42,7 +42,7 @@
  * @summary Test periodic setting that involves chunks.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.event.TestChunkPeriod
  */
 public class TestChunkPeriod {
diff --git a/jdk/test/jdk/jfr/api/recording/event/TestEnableClass.java b/jdk/test/jdk/jfr/api/recording/event/TestEnableClass.java
index fbad872889c..62dbb03df5b 100644
--- a/jdk/test/jdk/jfr/api/recording/event/TestEnableClass.java
+++ b/jdk/test/jdk/jfr/api/recording/event/TestEnableClass.java
@@ -33,7 +33,7 @@
  * @summary Simple enable Event class.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.event.TestEnableClass
  */
 public class TestEnableClass {
diff --git a/jdk/test/jdk/jfr/api/recording/event/TestEnableName.java b/jdk/test/jdk/jfr/api/recording/event/TestEnableName.java
index c8a55e4d293..730e1c2b75e 100644
--- a/jdk/test/jdk/jfr/api/recording/event/TestEnableName.java
+++ b/jdk/test/jdk/jfr/api/recording/event/TestEnableName.java
@@ -40,7 +40,7 @@
  * @summary Simple enable Event class.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.event.TestEnableName
  */
 public class TestEnableName {
diff --git a/jdk/test/jdk/jfr/api/recording/event/TestEventTime.java b/jdk/test/jdk/jfr/api/recording/event/TestEventTime.java
index a93feac639e..37b712674a0 100644
--- a/jdk/test/jdk/jfr/api/recording/event/TestEventTime.java
+++ b/jdk/test/jdk/jfr/api/recording/event/TestEventTime.java
@@ -43,7 +43,7 @@
  * @summary Test getStartTime() and getEndTime(). Verify startTime <= endTime
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.event.TestEventTime
  */
 public class TestEventTime {
diff --git a/jdk/test/jdk/jfr/api/recording/event/TestLoadEventAfterStart.java b/jdk/test/jdk/jfr/api/recording/event/TestLoadEventAfterStart.java
index 2e7fb93099e..216e4e9572a 100644
--- a/jdk/test/jdk/jfr/api/recording/event/TestLoadEventAfterStart.java
+++ b/jdk/test/jdk/jfr/api/recording/event/TestLoadEventAfterStart.java
@@ -41,7 +41,7 @@
  * @summary Load event class after recording started.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @build jdk.test.lib.jfr.SimpleEvent
  * @run main/othervm jdk.jfr.api.recording.event.TestLoadEventAfterStart
  */
diff --git a/jdk/test/jdk/jfr/api/recording/event/TestPeriod.java b/jdk/test/jdk/jfr/api/recording/event/TestPeriod.java
index 7851ae546f6..1424495d370 100644
--- a/jdk/test/jdk/jfr/api/recording/event/TestPeriod.java
+++ b/jdk/test/jdk/jfr/api/recording/event/TestPeriod.java
@@ -42,7 +42,7 @@
  * @summary Test event period.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.event.TestPeriod
  */
 public class TestPeriod {
diff --git a/jdk/test/jdk/jfr/api/recording/event/TestReEnableClass.java b/jdk/test/jdk/jfr/api/recording/event/TestReEnableClass.java
index a0841d8f0d6..63ebc39cd67 100644
--- a/jdk/test/jdk/jfr/api/recording/event/TestReEnableClass.java
+++ b/jdk/test/jdk/jfr/api/recording/event/TestReEnableClass.java
@@ -36,7 +36,7 @@
  * @summary Enable, disable, enable event during recording.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.event.TestReEnableClass
  */
 public class TestReEnableClass {
diff --git a/jdk/test/jdk/jfr/api/recording/event/TestReEnableMultiple.java b/jdk/test/jdk/jfr/api/recording/event/TestReEnableMultiple.java
index 91c84f5dbe4..1645b2c7cbf 100644
--- a/jdk/test/jdk/jfr/api/recording/event/TestReEnableMultiple.java
+++ b/jdk/test/jdk/jfr/api/recording/event/TestReEnableMultiple.java
@@ -44,7 +44,7 @@
  * @summary Enable, disable, enable event during recording.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.event.TestReEnableMultiple
  */
 public class TestReEnableMultiple {
diff --git a/jdk/test/jdk/jfr/api/recording/event/TestReEnableName.java b/jdk/test/jdk/jfr/api/recording/event/TestReEnableName.java
index d475d2c6182..80e20b2557b 100644
--- a/jdk/test/jdk/jfr/api/recording/event/TestReEnableName.java
+++ b/jdk/test/jdk/jfr/api/recording/event/TestReEnableName.java
@@ -40,7 +40,7 @@
  * @summary Enable/disable event by name during recording.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.event.TestReEnableName
  */
 public class TestReEnableName {
diff --git a/jdk/test/jdk/jfr/api/recording/event/TestRecordingEnableDisable.java b/jdk/test/jdk/jfr/api/recording/event/TestRecordingEnableDisable.java
index 6b374e4495b..2b87858f7c8 100644
--- a/jdk/test/jdk/jfr/api/recording/event/TestRecordingEnableDisable.java
+++ b/jdk/test/jdk/jfr/api/recording/event/TestRecordingEnableDisable.java
@@ -41,7 +41,7 @@
  * @summary Enable, disable, enable event during recording.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.event.TestRecordingEnableDisable
  */
 public class TestRecordingEnableDisable {
diff --git a/jdk/test/jdk/jfr/api/recording/event/TestThreshold.java b/jdk/test/jdk/jfr/api/recording/event/TestThreshold.java
index 71de84119a8..d9d6df9224b 100644
--- a/jdk/test/jdk/jfr/api/recording/event/TestThreshold.java
+++ b/jdk/test/jdk/jfr/api/recording/event/TestThreshold.java
@@ -39,7 +39,7 @@
  * @summary Test event threshold.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.event.TestThreshold
  */
 public class TestThreshold {
diff --git a/jdk/test/jdk/jfr/api/recording/misc/TestGetId.java b/jdk/test/jdk/jfr/api/recording/misc/TestGetId.java
index 075bfbb32b1..1680c1a1f79 100644
--- a/jdk/test/jdk/jfr/api/recording/misc/TestGetId.java
+++ b/jdk/test/jdk/jfr/api/recording/misc/TestGetId.java
@@ -36,7 +36,7 @@
  * @summary Verify that each recording get unique a id
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm  jdk.jfr.api.recording.misc.TestGetId
  */
 public class TestGetId {
diff --git a/jdk/test/jdk/jfr/api/recording/misc/TestGetSize.java b/jdk/test/jdk/jfr/api/recording/misc/TestGetSize.java
index d1517887907..51725ad1e95 100644
--- a/jdk/test/jdk/jfr/api/recording/misc/TestGetSize.java
+++ b/jdk/test/jdk/jfr/api/recording/misc/TestGetSize.java
@@ -40,7 +40,7 @@
  * @summary Test recording file size with Recording.getSize()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.misc.TestGetSize
  */
 public class TestGetSize {
diff --git a/jdk/test/jdk/jfr/api/recording/misc/TestGetSizeToMem.java b/jdk/test/jdk/jfr/api/recording/misc/TestGetSizeToMem.java
index 11322805f20..75745fff24a 100644
--- a/jdk/test/jdk/jfr/api/recording/misc/TestGetSizeToMem.java
+++ b/jdk/test/jdk/jfr/api/recording/misc/TestGetSizeToMem.java
@@ -41,7 +41,7 @@
  * @summary Test recording file size with Recording.getSize()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.misc.TestGetSizeToMem
  */
 public class TestGetSizeToMem {
diff --git a/jdk/test/jdk/jfr/api/recording/misc/TestGetStream.java b/jdk/test/jdk/jfr/api/recording/misc/TestGetStream.java
index 78cc1eca2bd..913fc648d2c 100644
--- a/jdk/test/jdk/jfr/api/recording/misc/TestGetStream.java
+++ b/jdk/test/jdk/jfr/api/recording/misc/TestGetStream.java
@@ -48,7 +48,7 @@
  * @summary A simple test for Recording.getStream()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.misc.TestGetStream
  */
 public class TestGetStream {
diff --git a/jdk/test/jdk/jfr/api/recording/misc/TestRecordingBase.java b/jdk/test/jdk/jfr/api/recording/misc/TestRecordingBase.java
index a8284fd459d..1cafad73498 100644
--- a/jdk/test/jdk/jfr/api/recording/misc/TestRecordingBase.java
+++ b/jdk/test/jdk/jfr/api/recording/misc/TestRecordingBase.java
@@ -45,7 +45,7 @@
  * @summary Basic tests for Recording
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.misc.TestRecordingBase
  */
 public class TestRecordingBase {
diff --git a/jdk/test/jdk/jfr/api/recording/misc/TestRecordingCopy.java b/jdk/test/jdk/jfr/api/recording/misc/TestRecordingCopy.java
index f1c5bd84245..95c8c65dc14 100644
--- a/jdk/test/jdk/jfr/api/recording/misc/TestRecordingCopy.java
+++ b/jdk/test/jdk/jfr/api/recording/misc/TestRecordingCopy.java
@@ -38,7 +38,7 @@
  * @summary A simple test for Recording.copy()
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.misc.TestRecordingCopy
  */
 public class TestRecordingCopy {
diff --git a/jdk/test/jdk/jfr/api/recording/options/TestDuration.java b/jdk/test/jdk/jfr/api/recording/options/TestDuration.java
index 1d88aae4b39..bdc3f8fd089 100644
--- a/jdk/test/jdk/jfr/api/recording/options/TestDuration.java
+++ b/jdk/test/jdk/jfr/api/recording/options/TestDuration.java
@@ -38,7 +38,7 @@
  * @summary Test setDuration(). Verify recording is stopped automatically.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.options.TestDuration
  */
 public class TestDuration {
diff --git a/jdk/test/jdk/jfr/api/recording/options/TestName.java b/jdk/test/jdk/jfr/api/recording/options/TestName.java
index a37eaaedbef..d20c2bd0a60 100644
--- a/jdk/test/jdk/jfr/api/recording/options/TestName.java
+++ b/jdk/test/jdk/jfr/api/recording/options/TestName.java
@@ -35,7 +35,7 @@
  * @summary Test setName().
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.options.TestName
  */
 public class TestName {
diff --git a/jdk/test/jdk/jfr/api/recording/settings/TestConfigurationGetContents.java b/jdk/test/jdk/jfr/api/recording/settings/TestConfigurationGetContents.java
index 2f6c6edbac2..42083779a7a 100644
--- a/jdk/test/jdk/jfr/api/recording/settings/TestConfigurationGetContents.java
+++ b/jdk/test/jdk/jfr/api/recording/settings/TestConfigurationGetContents.java
@@ -37,7 +37,7 @@
  * @summary Verifies Configuration.getContents() for every configuration
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.settings.TestConfigurationGetContents
  */
 public class TestConfigurationGetContents {
diff --git a/jdk/test/jdk/jfr/api/recording/settings/TestCreateConfigFromPath.java b/jdk/test/jdk/jfr/api/recording/settings/TestCreateConfigFromPath.java
index 30cca24a078..571e9451c81 100644
--- a/jdk/test/jdk/jfr/api/recording/settings/TestCreateConfigFromPath.java
+++ b/jdk/test/jdk/jfr/api/recording/settings/TestCreateConfigFromPath.java
@@ -40,7 +40,7 @@
  * @summary Test setName().
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.settings.TestCreateConfigFromPath
  */
 public class TestCreateConfigFromPath {
diff --git a/jdk/test/jdk/jfr/api/recording/settings/TestCreateConfigFromReader.java b/jdk/test/jdk/jfr/api/recording/settings/TestCreateConfigFromReader.java
index 766aaff383b..d44b5b2b658 100644
--- a/jdk/test/jdk/jfr/api/recording/settings/TestCreateConfigFromReader.java
+++ b/jdk/test/jdk/jfr/api/recording/settings/TestCreateConfigFromReader.java
@@ -40,7 +40,7 @@
  * @summary Test setName().
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.settings.TestCreateConfigFromReader
  */
 public class TestCreateConfigFromReader {
diff --git a/jdk/test/jdk/jfr/api/recording/settings/TestGetConfigurations.java b/jdk/test/jdk/jfr/api/recording/settings/TestGetConfigurations.java
index 37a41f438d1..98094e5970b 100644
--- a/jdk/test/jdk/jfr/api/recording/settings/TestGetConfigurations.java
+++ b/jdk/test/jdk/jfr/api/recording/settings/TestGetConfigurations.java
@@ -35,7 +35,7 @@
  *          the expected parameters
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.settings.TestGetConfigurations
  */
 public class TestGetConfigurations {
diff --git a/jdk/test/jdk/jfr/api/recording/settings/TestSettingsAvailability.java b/jdk/test/jdk/jfr/api/recording/settings/TestSettingsAvailability.java
index c040808b149..d6d29d5dacd 100644
--- a/jdk/test/jdk/jfr/api/recording/settings/TestSettingsAvailability.java
+++ b/jdk/test/jdk/jfr/api/recording/settings/TestSettingsAvailability.java
@@ -44,7 +44,7 @@
  * @summary Verifies that event types has the correct type of settings
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.settings.TestSettingsAvailability
  */
 public class TestSettingsAvailability {
diff --git a/jdk/test/jdk/jfr/api/recording/state/TestOptionState.java b/jdk/test/jdk/jfr/api/recording/state/TestOptionState.java
index 4c1ff2628dc..1e08208c881 100644
--- a/jdk/test/jdk/jfr/api/recording/state/TestOptionState.java
+++ b/jdk/test/jdk/jfr/api/recording/state/TestOptionState.java
@@ -36,7 +36,7 @@
  * @key jfr
  * @summary Test options in different states
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.state.TestOptionState
  */
 public class TestOptionState {
diff --git a/jdk/test/jdk/jfr/api/recording/state/TestState.java b/jdk/test/jdk/jfr/api/recording/state/TestState.java
index 2b6863f2573..1c285cf3fb2 100644
--- a/jdk/test/jdk/jfr/api/recording/state/TestState.java
+++ b/jdk/test/jdk/jfr/api/recording/state/TestState.java
@@ -36,7 +36,7 @@
  * @summary Test Recording state
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.state.TestState
  */
 public class TestState {
diff --git a/jdk/test/jdk/jfr/api/recording/state/TestStateDuration.java b/jdk/test/jdk/jfr/api/recording/state/TestStateDuration.java
index f13ff8332c1..bbecee84845 100644
--- a/jdk/test/jdk/jfr/api/recording/state/TestStateDuration.java
+++ b/jdk/test/jdk/jfr/api/recording/state/TestStateDuration.java
@@ -39,7 +39,7 @@
  * @summary Test Recording state
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.state.TestStateDuration
  */
 public class TestStateDuration {
diff --git a/jdk/test/jdk/jfr/api/recording/state/TestStateIdenticalListeners.java b/jdk/test/jdk/jfr/api/recording/state/TestStateIdenticalListeners.java
index 9e8cf888eab..291108a9719 100644
--- a/jdk/test/jdk/jfr/api/recording/state/TestStateIdenticalListeners.java
+++ b/jdk/test/jdk/jfr/api/recording/state/TestStateIdenticalListeners.java
@@ -36,7 +36,7 @@
  * @summary Test Recording state with concurrent recordings
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.state.TestStateIdenticalListeners
  */
 public class TestStateIdenticalListeners {
diff --git a/jdk/test/jdk/jfr/api/recording/state/TestStateInvalid.java b/jdk/test/jdk/jfr/api/recording/state/TestStateInvalid.java
index 3e3ebbf7024..8637a53f18b 100644
--- a/jdk/test/jdk/jfr/api/recording/state/TestStateInvalid.java
+++ b/jdk/test/jdk/jfr/api/recording/state/TestStateInvalid.java
@@ -35,7 +35,7 @@
  * @summary Test start/stop/close recording from different recording states.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.state.TestStateInvalid
  */
 public class TestStateInvalid {
diff --git a/jdk/test/jdk/jfr/api/recording/state/TestStateMultiple.java b/jdk/test/jdk/jfr/api/recording/state/TestStateMultiple.java
index b10adaaa411..c329e97afcf 100644
--- a/jdk/test/jdk/jfr/api/recording/state/TestStateMultiple.java
+++ b/jdk/test/jdk/jfr/api/recording/state/TestStateMultiple.java
@@ -35,7 +35,7 @@
  * @summary Test Recording state with concurrent recordings
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.state.TestStateMultiple
  */
 public class TestStateMultiple {
diff --git a/jdk/test/jdk/jfr/api/recording/state/TestStateScheduleStart.java b/jdk/test/jdk/jfr/api/recording/state/TestStateScheduleStart.java
index 55072b9e67b..268bd7d5746 100644
--- a/jdk/test/jdk/jfr/api/recording/state/TestStateScheduleStart.java
+++ b/jdk/test/jdk/jfr/api/recording/state/TestStateScheduleStart.java
@@ -38,7 +38,7 @@
  * @summary Test Recording state
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.state.TestStateScheduleStart
  */
 public class TestStateScheduleStart {
diff --git a/jdk/test/jdk/jfr/api/recording/time/TestTime.java b/jdk/test/jdk/jfr/api/recording/time/TestTime.java
index a35546dfced..c7b47ea17c0 100644
--- a/jdk/test/jdk/jfr/api/recording/time/TestTime.java
+++ b/jdk/test/jdk/jfr/api/recording/time/TestTime.java
@@ -35,7 +35,7 @@
  * @key jfr
  * @summary Test Recording.get*Time()
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm  jdk.jfr.api.recording.time.TestTime
  */
 
diff --git a/jdk/test/jdk/jfr/api/recording/time/TestTimeDuration.java b/jdk/test/jdk/jfr/api/recording/time/TestTimeDuration.java
index c0189ef87a1..b8f526fc00f 100644
--- a/jdk/test/jdk/jfr/api/recording/time/TestTimeDuration.java
+++ b/jdk/test/jdk/jfr/api/recording/time/TestTimeDuration.java
@@ -36,7 +36,7 @@
  * @key jfr
  * @summary Test Recording.setDuration() and Recording.get*Time()
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.time.TestTimeDuration
  */
 
diff --git a/jdk/test/jdk/jfr/api/recording/time/TestTimeMultiple.java b/jdk/test/jdk/jfr/api/recording/time/TestTimeMultiple.java
index 99bfd40092a..293cebd7cde 100644
--- a/jdk/test/jdk/jfr/api/recording/time/TestTimeMultiple.java
+++ b/jdk/test/jdk/jfr/api/recording/time/TestTimeMultiple.java
@@ -35,7 +35,7 @@
  * @key jfr
  * @summary Test recording times with concurrent recordings
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.time.TestTimeMultiple
  */
 
diff --git a/jdk/test/jdk/jfr/api/recording/time/TestTimeScheduleStart.java b/jdk/test/jdk/jfr/api/recording/time/TestTimeScheduleStart.java
index 34692d608f1..0cee5afd7bd 100644
--- a/jdk/test/jdk/jfr/api/recording/time/TestTimeScheduleStart.java
+++ b/jdk/test/jdk/jfr/api/recording/time/TestTimeScheduleStart.java
@@ -38,7 +38,7 @@
  * @key jfr
  * @summary Test Recording.scheduleStart() and Recording.get*Time()
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.recording.time.TestTimeScheduleStart
  */
 
diff --git a/jdk/test/jdk/jfr/api/settings/TestFilterEvents.java b/jdk/test/jdk/jfr/api/settings/TestFilterEvents.java
index 7c7bea2c5bd..60535fb8e9e 100644
--- a/jdk/test/jdk/jfr/api/settings/TestFilterEvents.java
+++ b/jdk/test/jdk/jfr/api/settings/TestFilterEvents.java
@@ -39,7 +39,7 @@
  * @summary The test uses SettingControl
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.api.settings.TestFilterEvents
  */
 public class TestFilterEvents {
diff --git a/jdk/test/jdk/jfr/event/compiler/TestAllocInNewTLAB.java b/jdk/test/jdk/jfr/event/compiler/TestAllocInNewTLAB.java
index 70b7ab44cff..b42c26a317a 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestAllocInNewTLAB.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestAllocInNewTLAB.java
@@ -41,7 +41,7 @@
  * @summary Test that event is triggered when an object is allocated in a new TLAB.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseTLAB -XX:TLABSize=100k -XX:-ResizeTLAB -XX:TLABRefillWasteFraction=1 jdk.jfr.event.compiler.TestAllocInNewTLAB
  * @run main/othervm -XX:+UseTLAB -XX:TLABSize=100k -XX:-ResizeTLAB -XX:TLABRefillWasteFraction=1 -XX:-FastTLABRefill jdk.jfr.event.compiler.TestAllocInNewTLAB
  * @run main/othervm -XX:+UseTLAB -XX:TLABSize=100k -XX:-ResizeTLAB -XX:TLABRefillWasteFraction=1 -Xint jdk.jfr.event.compiler.TestAllocInNewTLAB
diff --git a/jdk/test/jdk/jfr/event/compiler/TestAllocOutsideTLAB.java b/jdk/test/jdk/jfr/event/compiler/TestAllocOutsideTLAB.java
index 99b0a471d70..a474d420d9b 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestAllocOutsideTLAB.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestAllocOutsideTLAB.java
@@ -41,7 +41,7 @@
  * @summary Test that when an object is allocated outside a TLAB an event will be triggered.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseTLAB -XX:-FastTLABRefill -XX:TLABSize=90k -XX:-ResizeTLAB -XX:TLABRefillWasteFraction=256 jdk.jfr.event.compiler.TestAllocOutsideTLAB
  * @run main/othervm -XX:+UseTLAB -XX:-FastTLABRefill -XX:TLABSize=90k -XX:-ResizeTLAB -XX:TLABRefillWasteFraction=256 jdk.jfr.event.compiler.TestAllocOutsideTLAB
  * @run main/othervm -XX:+UseTLAB -XX:-FastTLABRefill -XX:TLABSize=90k -XX:-ResizeTLAB -XX:TLABRefillWasteFraction=256 -Xint jdk.jfr.event.compiler.TestAllocOutsideTLAB
diff --git a/jdk/test/jdk/jfr/event/compiler/TestCodeCacheConfig.java b/jdk/test/jdk/jfr/event/compiler/TestCodeCacheConfig.java
index 7fbf60263d9..7b120cb73ba 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestCodeCacheConfig.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestCodeCacheConfig.java
@@ -38,7 +38,7 @@
  * @test TestCodeCacheConfig
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *     sun.hotspot.WhiteBox$WhiteBoxPermission
diff --git a/jdk/test/jdk/jfr/event/compiler/TestCodeCacheFull.java b/jdk/test/jdk/jfr/event/compiler/TestCodeCacheFull.java
index 9a689e18089..5e18aee8365 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestCodeCacheFull.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestCodeCacheFull.java
@@ -39,7 +39,7 @@
  * @test TestCodeCacheFull
  *
  *
- * @library /lib
+ * @library /test/lib
  *
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
diff --git a/jdk/test/jdk/jfr/event/compiler/TestCodeCacheStats.java b/jdk/test/jdk/jfr/event/compiler/TestCodeCacheStats.java
index 601eea670ad..1ec938a80f1 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestCodeCacheStats.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestCodeCacheStats.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.compiler.TestCodeCacheStats
  */
 
diff --git a/jdk/test/jdk/jfr/event/compiler/TestCodeSweeper.java b/jdk/test/jdk/jfr/event/compiler/TestCodeSweeper.java
index da7ed5972b8..6648fc2486a 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestCodeSweeper.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestCodeSweeper.java
@@ -55,7 +55,7 @@
  * @test TestCodeSweeper
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @build sun.hotspot.WhiteBox
  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
  *                                sun.hotspot.WhiteBox$WhiteBoxPermission
diff --git a/jdk/test/jdk/jfr/event/compiler/TestCodeSweeperConfig.java b/jdk/test/jdk/jfr/event/compiler/TestCodeSweeperConfig.java
index 7e0e17bdda8..782ad5fa81d 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestCodeSweeperConfig.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestCodeSweeperConfig.java
@@ -37,7 +37,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseCodeCacheFlushing jdk.jfr.event.compiler.TestCodeSweeperConfig
  */
 public class TestCodeSweeperConfig {
diff --git a/jdk/test/jdk/jfr/event/compiler/TestCompilerCompile.java b/jdk/test/jdk/jfr/event/compiler/TestCompilerCompile.java
index c1aabc9eb62..765f723868f 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestCompilerCompile.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestCompilerCompile.java
@@ -44,7 +44,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *     sun.hotspot.WhiteBox$WhiteBoxPermission
diff --git a/jdk/test/jdk/jfr/event/compiler/TestCompilerConfig.java b/jdk/test/jdk/jfr/event/compiler/TestCompilerConfig.java
index d52503c47f3..c17b2c03ff6 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestCompilerConfig.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestCompilerConfig.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.compiler.TestCompilerConfig
  */
 public class TestCompilerConfig {
diff --git a/jdk/test/jdk/jfr/event/compiler/TestCompilerInlining.java b/jdk/test/jdk/jfr/event/compiler/TestCompilerInlining.java
index 9868f339274..5a37784a07a 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestCompilerInlining.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestCompilerInlining.java
@@ -51,7 +51,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
 
  *
diff --git a/jdk/test/jdk/jfr/event/compiler/TestCompilerPhase.java b/jdk/test/jdk/jfr/event/compiler/TestCompilerPhase.java
index 256a833793b..3b80f795652 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestCompilerPhase.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestCompilerPhase.java
@@ -40,7 +40,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *     sun.hotspot.WhiteBox$WhiteBoxPermission
diff --git a/jdk/test/jdk/jfr/event/compiler/TestCompilerStats.java b/jdk/test/jdk/jfr/event/compiler/TestCompilerStats.java
index fc2a47304c9..fbbed420c11 100644
--- a/jdk/test/jdk/jfr/event/compiler/TestCompilerStats.java
+++ b/jdk/test/jdk/jfr/event/compiler/TestCompilerStats.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.compiler.TestCompilerStats
  */
 public class TestCompilerStats {
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java
index 568cf690aa3..8932458b1b0 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithCMSConcurrent.java
@@ -32,7 +32,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run driver jdk.jfr.event.gc.collection.TestGCCauseWithCMSConcurrent
  */
 public class TestGCCauseWithCMSConcurrent {
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java
index 70097add4c8..e5191253750 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithCMSMarkSweep.java
@@ -33,7 +33,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run driver jdk.jfr.event.gc.collection.TestGCCauseWithCMSMarkSweep
  */
 public class TestGCCauseWithCMSMarkSweep {
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithG1ConcurrentMark.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithG1ConcurrentMark.java
index 21e1e68b715..ffd8dfd2f68 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithG1ConcurrentMark.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithG1ConcurrentMark.java
@@ -33,7 +33,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run driver jdk.jfr.event.gc.collection.TestGCCauseWithG1ConcurrentMark
  */
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithG1FullCollection.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithG1FullCollection.java
index 93042ee1844..7cd622189cf 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithG1FullCollection.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithG1FullCollection.java
@@ -33,7 +33,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run driver jdk.jfr.event.gc.collection.TestGCCauseWithG1FullCollection
  */
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithPSMarkSweep.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithPSMarkSweep.java
index 8bd9dcd7c95..dfbfff32003 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithPSMarkSweep.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithPSMarkSweep.java
@@ -32,7 +32,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run driver jdk.jfr.event.gc.collection.TestGCCauseWithPSMarkSweep
  */
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java
index 8a760ff0322..fcf0de593d3 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithParallelOld.java
@@ -32,7 +32,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run driver jdk.jfr.event.gc.collection.TestGCCauseWithParallelOld
  */
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithSerial.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithSerial.java
index 861c45b520e..837e71413b6 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithSerial.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCCauseWithSerial.java
@@ -32,7 +32,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run driver jdk.jfr.event.gc.collection.TestGCCauseWithSerial
  */
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java
index 878e6e1b9af..3dc7f3f2cd5 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSConcurrent.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xmx32m -Xmn8m -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent jdk.jfr.event.gc.collection.TestGCEventMixedWithCMSConcurrent
  * good debug flags:-XX:+PrintGCDetails -XX:+PrintGC
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java
index ee357e739ab..1be6695772f 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithCMSMarkSweep.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xmx32m -Xmn8m -XX:+UseConcMarkSweepGC -XX:-ExplicitGCInvokesConcurrent jdk.jfr.event.gc.collection.TestGCEventMixedWithCMSMarkSweep
  * good debug flags:-XX:+PrintGCDetails -XX:+PrintGC
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1ConcurrentMark.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1ConcurrentMark.java
index 4838586c333..105b2e84499 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1ConcurrentMark.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1ConcurrentMark.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xmx32m -Xmn8m -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent jdk.jfr.event.gc.collection.TestGCEventMixedWithG1ConcurrentMark
  * good debug flags: -XX:+PrintGCDetails -XX:+PrintGC
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1FullCollection.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1FullCollection.java
index db98e06deea..0d72a4bd8e9 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1FullCollection.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithG1FullCollection.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xmx32m -Xmn8m -XX:+UseG1GC -XX:-ExplicitGCInvokesConcurrent jdk.jfr.event.gc.collection.TestGCEventMixedWithG1FullCollection
  * good debug flags: -XX:+PrintGCDetails -XX:+PrintGC
  */
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithPSMarkSweep.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithPSMarkSweep.java
index 777a4a1f262..f6b619cf330 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithPSMarkSweep.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithPSMarkSweep.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xmx32m -Xmn8m -XX:+UseParallelGC -XX:-UseParallelOldGC jdk.jfr.event.gc.collection.TestGCEventMixedWithPSMarkSweep
  * good debug flags:-XX:+PrintGCDetails -XX:+PrintGC
  */
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java
index 25b15f6ee66..1cb7eaf63a9 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithParNew.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Xmx32m -Xmn8m -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseConcMarkSweepGC jdk.jfr.event.gc.collection.TestGCEventMixedWithParNew
  * good debug flags:-XX:+PrintGCDetails -XX:+PrintGC
  */
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithParallelOld.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithParallelOld.java
index 84b1c47c22a..16851be3c65 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithParallelOld.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithParallelOld.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xmx32m -Xmn8m -XX:+UseParallelGC -XX:+UseParallelOldGC jdk.jfr.event.gc.collection.TestGCEventMixedWithParallelOld
  * good debug flags: -XX:+PrintGCDetails -XX:+PrintGC  -verbose:class
  */
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithSerial.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithSerial.java
index 1b8e1a9c3fb..dacef4f515f 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithSerial.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCEventMixedWithSerial.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -Xmx32m -Xmn8m -XX:+UseSerialGC jdk.jfr.event.gc.collection.TestGCEventMixedWithSerial
  */
 public class TestGCEventMixedWithSerial {
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCGarbageCollectionEvent.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCGarbageCollectionEvent.java
index 7c024c28c85..67a59c0c7b8 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCGarbageCollectionEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCGarbageCollectionEvent.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+PrintGCDetails -XX:+PrintGC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps jdk.jfr.event.gc.collection.TestGCGarbageCollectionEvent
  */
 public class TestGCGarbageCollectionEvent {
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestGCWithFasttime.java b/jdk/test/jdk/jfr/event/gc/collection/TestGCWithFasttime.java
index 5003680673e..ce037b73f2a 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestGCWithFasttime.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestGCWithFasttime.java
@@ -38,7 +38,7 @@
  * @key jfr
  *
   *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseParallelGC -XX:+UseParallelOldGC jdk.jfr.event.gc.collection.TestGCWithFasttime
  */
 public class TestGCWithFasttime {
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithDefNew.java b/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithDefNew.java
index c03f7db6e77..30fb001af09 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithDefNew.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithDefNew.java
@@ -30,7 +30,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Xmx50m -Xmn2m -XX:+UseSerialGC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.collection.TestYoungGarbageCollectionEventWithDefNew
  */
 public class TestYoungGarbageCollectionEventWithDefNew {
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithG1New.java b/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithG1New.java
index 886f182f904..1ba23f25979 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithG1New.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithG1New.java
@@ -30,7 +30,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Xmx50m -Xmn2m -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.collection.TestYoungGarbageCollectionEventWithG1New
  */
 public class TestYoungGarbageCollectionEventWithG1New {
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java b/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java
index 5a5877e531c..4735494456e 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParNew.java
@@ -30,7 +30,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Xmx50m -Xmn2m -XX:+UseConcMarkSweepGC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.collection.TestYoungGarbageCollectionEventWithParNew
  */
 public class TestYoungGarbageCollectionEventWithParNew {
diff --git a/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParallelScavenge.java b/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParallelScavenge.java
index d5cbe2e8ef2..77c1ad77504 100644
--- a/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParallelScavenge.java
+++ b/jdk/test/jdk/jfr/event/gc/collection/TestYoungGarbageCollectionEventWithParallelScavenge.java
@@ -30,7 +30,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Xmx50m -Xmn2m -XX:+UseParallelGC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:-UseAdaptiveSizePolicy -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.collection.TestYoungGarbageCollectionEventWithParallelScavenge
  */
 public class TestYoungGarbageCollectionEventWithParallelScavenge {
diff --git a/jdk/test/jdk/jfr/event/gc/configuration/TestGCConfigurationEvent.java b/jdk/test/jdk/jfr/event/gc/configuration/TestGCConfigurationEvent.java
index cf981c1fd27..d0bbe576fee 100644
--- a/jdk/test/jdk/jfr/event/gc/configuration/TestGCConfigurationEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/configuration/TestGCConfigurationEvent.java
@@ -40,7 +40,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:ParallelGCThreads=3 -XX:ConcGCThreads=2 -XX:+UseDynamicNumberOfGCThreads -XX:-ExplicitGCInvokesConcurrent -XX:-DisableExplicitGC -XX:MaxGCPauseMillis=800 -XX:GCTimeRatio=19 jdk.jfr.event.gc.configuration.TestGCConfigurationEvent
  */
 public class TestGCConfigurationEvent {
diff --git a/jdk/test/jdk/jfr/event/gc/configuration/TestGCConfigurationEventWithDefaultPauseTarget.java b/jdk/test/jdk/jfr/event/gc/configuration/TestGCConfigurationEventWithDefaultPauseTarget.java
index 2d3bd3d7ec3..cc772bf169e 100644
--- a/jdk/test/jdk/jfr/event/gc/configuration/TestGCConfigurationEventWithDefaultPauseTarget.java
+++ b/jdk/test/jdk/jfr/event/gc/configuration/TestGCConfigurationEventWithDefaultPauseTarget.java
@@ -39,7 +39,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps jdk.jfr.event.gc.configuration.TestGCConfigurationEventWithDefaultPauseTarget
  */
 public class TestGCConfigurationEventWithDefaultPauseTarget {
diff --git a/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWith32BitOops.sh b/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWith32BitOops.sh
index 062b7ee1528..3cef926a13a 100644
--- a/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWith32BitOops.sh
+++ b/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWith32BitOops.sh
@@ -24,7 +24,7 @@
 # @key jfr
 #
 #
-# @library /lib /
+# @library /test/lib /
 # @build jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWith32BitOops sun.hotspot.WhiteBox
 # @run main ClassFileInstaller sun.hotspot.WhiteBox
 # @run shell TestGCHeapConfigurationEventWith32BitOops.sh
diff --git a/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithHeapBasedOops.sh b/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithHeapBasedOops.sh
index f5c1cc84700..b00a60d7464 100644
--- a/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithHeapBasedOops.sh
+++ b/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithHeapBasedOops.sh
@@ -24,7 +24,7 @@
 # @key jfr
 #
 #
-# @library /lib /
+# @library /test/lib /
 # @build jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWithHeapBasedOops
 # @run shell TestGCHeapConfigurationEventWithHeapBasedOops.sh
 
diff --git a/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithZeroBasedOops.sh b/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithZeroBasedOops.sh
index 04ae2818cbd..6d232459037 100644
--- a/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithZeroBasedOops.sh
+++ b/jdk/test/jdk/jfr/event/gc/configuration/TestGCHeapConfigurationEventWithZeroBasedOops.sh
@@ -24,7 +24,7 @@
 # @key jfr
 #
 #
-# @library /lib /
+# @library /test/lib /
 # @build jdk.jfr.event.gc.configuration.TestGCHeapConfigurationEventWithZeroBasedOops
 # @run shell TestGCHeapConfigurationEventWithZeroBasedOops.sh
 
diff --git a/jdk/test/jdk/jfr/event/gc/configuration/TestGCSurvivorConfigurationEvent.java b/jdk/test/jdk/jfr/event/gc/configuration/TestGCSurvivorConfigurationEvent.java
index bef7a49ab1b..c19ab2c990b 100644
--- a/jdk/test/jdk/jfr/event/gc/configuration/TestGCSurvivorConfigurationEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/configuration/TestGCSurvivorConfigurationEvent.java
@@ -40,7 +40,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:MaxTenuringThreshold=13 -XX:InitialTenuringThreshold=9 jdk.jfr.event.gc.configuration.TestGCSurvivorConfigurationEvent
  */
 public class TestGCSurvivorConfigurationEvent {
diff --git a/jdk/test/jdk/jfr/event/gc/configuration/TestGCTLABConfigurationEvent.java b/jdk/test/jdk/jfr/event/gc/configuration/TestGCTLABConfigurationEvent.java
index e81dd6da940..e1cba40fa39 100644
--- a/jdk/test/jdk/jfr/event/gc/configuration/TestGCTLABConfigurationEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/configuration/TestGCTLABConfigurationEvent.java
@@ -40,7 +40,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:+UseTLAB -XX:MinTLABSize=3k -XX:TLABRefillWasteFraction=96 jdk.jfr.event.gc.configuration.TestGCTLABConfigurationEvent
  */
 public class TestGCTLABConfigurationEvent {
diff --git a/jdk/test/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithMinAndMaxSize.java b/jdk/test/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithMinAndMaxSize.java
index bb1e776072b..55d2b322b50 100644
--- a/jdk/test/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithMinAndMaxSize.java
+++ b/jdk/test/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithMinAndMaxSize.java
@@ -34,7 +34,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run driver jdk.jfr.event.gc.configuration.TestGCYoungGenerationConfigurationEventWithMinAndMaxSize
  */
 public class TestGCYoungGenerationConfigurationEventWithMinAndMaxSize {
diff --git a/jdk/test/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithNewRatio.java b/jdk/test/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithNewRatio.java
index 556cbefa8fc..cbd288e05d0 100644
--- a/jdk/test/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithNewRatio.java
+++ b/jdk/test/jdk/jfr/event/gc/configuration/TestGCYoungGenerationConfigurationEventWithNewRatio.java
@@ -32,7 +32,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:NewRatio=4 jdk.jfr.event.gc.configuration.TestGCYoungGenerationConfigurationEventWithNewRatio
  */
 public class TestGCYoungGenerationConfigurationEventWithNewRatio
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java b/jdk/test/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java
index ab56d8549c7..4b8a123d703 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestCMSConcurrentModeFailureEvent.java
@@ -44,7 +44,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main jdk.jfr.event.gc.detailed.TestCMSConcurrentModeFailureEvent
  */
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestEvacuationFailedEvent.java b/jdk/test/jdk/jfr/event/gc/detailed/TestEvacuationFailedEvent.java
index c2f101831ec..03d08b55bc0 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestEvacuationFailedEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestEvacuationFailedEvent.java
@@ -39,7 +39,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  *
  * @run main jdk.jfr.event.gc.detailed.TestEvacuationFailedEvent
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestEvacuationInfoEvent.java b/jdk/test/jdk/jfr/event/gc/detailed/TestEvacuationInfoEvent.java
index a625e7b24b5..57360a3d608 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestEvacuationInfoEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestEvacuationInfoEvent.java
@@ -41,7 +41,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:G1HeapRegionSize=1m -Xmx64m -Xmn16m -XX:+UseG1GC jdk.jfr.event.gc.detailed.TestEvacuationInfoEvent
  */
 public class TestEvacuationInfoEvent {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestG1ConcurrentModeFailureEvent.java b/jdk/test/jdk/jfr/event/gc/detailed/TestG1ConcurrentModeFailureEvent.java
index ab700550007..1a9131df124 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestG1ConcurrentModeFailureEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestG1ConcurrentModeFailureEvent.java
@@ -44,7 +44,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main jdk.jfr.event.gc.detailed.TestG1ConcurrentModeFailureEvent
  */
 
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestG1EvacMemoryStatsEvent.java b/jdk/test/jdk/jfr/event/gc/detailed/TestG1EvacMemoryStatsEvent.java
index b23e13d268a..b312922fd38 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestG1EvacMemoryStatsEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestG1EvacMemoryStatsEvent.java
@@ -36,7 +36,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:NewSize=2m -XX:MaxNewSize=2m -Xmx32m -XX:+UseG1GC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps jdk.jfr.event.gc.detailed.TestG1EvacMemoryStatsEvent
  */
 public class TestG1EvacMemoryStatsEvent {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestG1HeapRegionTypeChangeEvent.java b/jdk/test/jdk/jfr/event/gc/detailed/TestG1HeapRegionTypeChangeEvent.java
index 1e4c7c5120a..82d166ed53c 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestG1HeapRegionTypeChangeEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestG1HeapRegionTypeChangeEvent.java
@@ -41,7 +41,7 @@
  *
  *
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:NewSize=2m -XX:MaxNewSize=2m -Xmx32m -XX:G1HeapRegionSize=1m -XX:+UseG1GC jdk.jfr.event.gc.detailed.TestG1HeapRegionTypeChangeEvent
  */
 
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestG1MMUEvent.java b/jdk/test/jdk/jfr/event/gc/detailed/TestG1MMUEvent.java
index 9c5eb7e9465..8d6a12c2cb5 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestG1MMUEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestG1MMUEvent.java
@@ -36,7 +36,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:NewSize=2m -XX:MaxNewSize=2m -Xmx32m -XX:+UseG1GC -XX:MaxGCPauseMillis=75 -XX:GCPauseIntervalMillis=150 -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps jdk.jfr.event.gc.detailed.TestG1MMUEvent
  */
 public class TestG1MMUEvent {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionEventWithG1.java b/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionEventWithG1.java
index 9cd119d2a6b..5e937dd1e8b 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionEventWithG1.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionEventWithG1.java
@@ -32,7 +32,7 @@
  *
  *
  *           & vm.opt.ExplicitGCInvokesConcurrent != true
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Xmx32m -Xms32m -Xmn12m -XX:+UseG1GC -XX:-UseStringDeduplication -XX:MaxTenuringThreshold=5 -XX:InitialTenuringThreshold=5
  * jdk.jfr.event.gc.detailed.TestPromotionEventWithG1
  */
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionEventWithParallelScavenge.java b/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionEventWithParallelScavenge.java
index 85b43b1dfcf..bc1000a1e84 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionEventWithParallelScavenge.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionEventWithParallelScavenge.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Xmx32m -Xms32m -Xmn12m -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:MaxTenuringThreshold=5 -XX:InitialTenuringThreshold=5 jdk.jfr.event.gc.detailed.TestPromotionEventWithParallelScavenge
  */
 public class TestPromotionEventWithParallelScavenge {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithDefNew.java b/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithDefNew.java
index 96cbcaccb3b..79f0378fdbe 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithDefNew.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithDefNew.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main jdk.jfr.event.gc.detailed.TestPromotionFailedEventWithDefNew
  */
 public class TestPromotionFailedEventWithDefNew {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java b/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java
index 824193bd8ce..179102143a5 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParNew.java
@@ -29,7 +29,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm  jdk.jfr.event.gc.detailed.TestPromotionFailedEventWithParNew
  */
 public class TestPromotionFailedEventWithParNew {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParallelScavenge.java b/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParallelScavenge.java
index 7dfe79c7452..466719ccefd 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParallelScavenge.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestPromotionFailedEventWithParallelScavenge.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main jdk.jfr.event.gc.detailed.TestPromotionFailedEventWithParallelScavenge
  */
 public class TestPromotionFailedEventWithParallelScavenge {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java b/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java
index f25dda88900..02982b6a899 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithCMS.java
@@ -28,7 +28,7 @@
  * @test
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithCMS
  */
 public class TestStressAllocationGCEventsWithCMS {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithDefNew.java b/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithDefNew.java
index f69359d60a3..32013e355bf 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithDefNew.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithDefNew.java
@@ -28,7 +28,7 @@
  * @test
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseSerialGC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithDefNew
  */
 public class TestStressAllocationGCEventsWithDefNew {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithG1.java b/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithG1.java
index d8659723a21..d132cccb938 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithG1.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithG1.java
@@ -28,7 +28,7 @@
  * @test
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseG1GC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithG1
  */
 public class TestStressAllocationGCEventsWithG1 {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java b/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java
index 7e5a9a867e6..f7344987772 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParNew.java
@@ -28,7 +28,7 @@
  * @test
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithParNew
  */
 public class TestStressAllocationGCEventsWithParNew {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParallel.java b/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParallel.java
index 420da591233..5415f959628 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParallel.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestStressAllocationGCEventsWithParallel.java
@@ -28,7 +28,7 @@
  * @test
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseParallelGC -Xmx64m jdk.jfr.event.gc.detailed.TestStressAllocationGCEventsWithParallel
  */
 public class TestStressAllocationGCEventsWithParallel {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java b/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java
index ce9a1f3409d..5f2527538e3 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithCMS.java
@@ -28,7 +28,7 @@
  * @test
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx256m jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithCMS 1048576
  */
 public class TestStressBigAllocationGCEventsWithCMS {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithDefNew.java b/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithDefNew.java
index afd31af2769..95d1bdc5572 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithDefNew.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithDefNew.java
@@ -28,7 +28,7 @@
  * @test
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseSerialGC -Xmx256m jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithDefNew 1048576
  */
 public class TestStressBigAllocationGCEventsWithDefNew {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithG1.java b/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithG1.java
index 2390a04e996..cca803e1e36 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithG1.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithG1.java
@@ -34,7 +34,7 @@
  * test will fail with OOME.
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseG1GC -XX:MaxNewSize=5m -Xmx256m -XX:G1HeapRegionSize=1048576 jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithG1 1048544
  */
 public class TestStressBigAllocationGCEventsWithG1 {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java b/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java
index 66919fec8cd..6f25b587cf9 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParNew.java
@@ -28,7 +28,7 @@
  * @test
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseConcMarkSweepGC -Xmx256m jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithParNew 1048576
  */
 public class TestStressBigAllocationGCEventsWithParNew {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParallel.java b/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParallel.java
index 2865030ca83..eb7c699dfe4 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParallel.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestStressBigAllocationGCEventsWithParallel.java
@@ -28,7 +28,7 @@
  * @test
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseParallelGC -Xmx256m jdk.jfr.event.gc.detailed.TestStressBigAllocationGCEventsWithParallel 1048576
  */
 public class TestStressBigAllocationGCEventsWithParallel {
diff --git a/jdk/test/jdk/jfr/event/gc/detailed/TestTenuringDistributionEvent.java b/jdk/test/jdk/jfr/event/gc/detailed/TestTenuringDistributionEvent.java
index d03a3429219..7ee2c1165c4 100644
--- a/jdk/test/jdk/jfr/event/gc/detailed/TestTenuringDistributionEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/detailed/TestTenuringDistributionEvent.java
@@ -40,7 +40,7 @@
  *
  *
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:NewSize=2m -XX:MaxNewSize=2m -Xmx32m -XX:+UseG1GC -XX:+NeverTenure jdk.jfr.event.gc.detailed.TestTenuringDistributionEvent
  */
 
diff --git a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryCommittedSize.java b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryCommittedSize.java
index 7e95789d1a4..9d41f4a6fdf 100644
--- a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryCommittedSize.java
+++ b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryCommittedSize.java
@@ -41,7 +41,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -XX:+UnlockExperimentalVMOptions
diff --git a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java
index 024bf712907..4f4d5e49d8c 100644
--- a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java
+++ b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventConcurrentCMS.java
@@ -40,7 +40,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent jdk.jfr.event.gc.heapsummary.TestHeapSummaryEventConcurrentCMS
  */
 public class TestHeapSummaryEventConcurrentCMS {
diff --git a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventDefNewSerial.java b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventDefNewSerial.java
index c02a12c5a1d..9f23c08ed8c 100644
--- a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventDefNewSerial.java
+++ b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventDefNewSerial.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseSerialGC jdk.jfr.event.gc.heapsummary.TestHeapSummaryEventDefNewSerial
  */
 public class TestHeapSummaryEventDefNewSerial {
diff --git a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventG1.java b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventG1.java
index 86dd1d9a472..941fe0dfe92 100644
--- a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventG1.java
+++ b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventG1.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseG1GC jdk.jfr.event.gc.heapsummary.TestHeapSummaryEventG1
  */
 public class TestHeapSummaryEventG1 {
diff --git a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSParOld.java b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSParOld.java
index 0facc7a6eb2..235f732170e 100644
--- a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSParOld.java
+++ b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSParOld.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC jdk.jfr.event.gc.heapsummary.TestHeapSummaryEventPSParOld
  */
 public class TestHeapSummaryEventPSParOld {
diff --git a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSSerial.java b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSSerial.java
index 902eba0244d..188895ea30e 100644
--- a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSSerial.java
+++ b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventPSSerial.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:-UseParallelOldGC -XX:+UseParallelGC jdk.jfr.event.gc.heapsummary.TestHeapSummaryEventPSSerial
  */
 public class TestHeapSummaryEventPSSerial {
diff --git a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java
index 91462d15c9a..52e84fd986f 100644
--- a/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java
+++ b/jdk/test/jdk/jfr/event/gc/heapsummary/TestHeapSummaryEventParNewCMS.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseConcMarkSweepGC jdk.jfr.event.gc.heapsummary.TestHeapSummaryEventParNewCMS
  */
 public class TestHeapSummaryEventParNewCMS {
diff --git a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java
index 5a5ac2fda65..aa587723233 100644
--- a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java
+++ b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSConcurrent.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithCMSConcurrent
  */
 public class TestObjectCountAfterGCEventWithCMSConcurrent {
diff --git a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java
index 6c8e06682a2..5e3049fcafe 100644
--- a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java
+++ b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithCMSMarkSweep.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseConcMarkSweepGC -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithCMSMarkSweep
  */
 public class TestObjectCountAfterGCEventWithCMSMarkSweep {
diff --git a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1ConcurrentMark.java b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1ConcurrentMark.java
index 1e00e7c043d..b216bc29544 100644
--- a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1ConcurrentMark.java
+++ b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1ConcurrentMark.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithG1ConcurrentMark
  */
 public class TestObjectCountAfterGCEventWithG1ConcurrentMark {
diff --git a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1FullCollection.java b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1FullCollection.java
index 9eb03695478..c915f9000fe 100644
--- a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1FullCollection.java
+++ b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithG1FullCollection.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseG1GC -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithG1FullCollection
  */
 public class TestObjectCountAfterGCEventWithG1FullCollection {
diff --git a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithPSMarkSweep.java b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithPSMarkSweep.java
index 9ba729568d8..996a1eedd1a 100644
--- a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithPSMarkSweep.java
+++ b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithPSMarkSweep.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseParallelGC -XX:-UseParallelOldGC -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithPSMarkSweep
  */
 public class TestObjectCountAfterGCEventWithPSMarkSweep {
diff --git a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithParallelOld.java b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithParallelOld.java
index 5aa77c291e9..60c7e168539 100644
--- a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithParallelOld.java
+++ b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithParallelOld.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseParallelGC -XX:+UseParallelOldGC -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithParallelOld
  */
 public class TestObjectCountAfterGCEventWithParallelOld {
diff --git a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithSerial.java b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithSerial.java
index d017a8adefe..aedc91f3233 100644
--- a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithSerial.java
+++ b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountAfterGCEventWithSerial.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseSerialGC -XX:MarkSweepDeadRatio=0 -XX:-UseCompressedOops -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountAfterGCEventWithSerial
  */
 public class TestObjectCountAfterGCEventWithSerial {
diff --git a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountEvent.java b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountEvent.java
index 2e0f034bea7..056c69d824d 100644
--- a/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountEvent.java
+++ b/jdk/test/jdk/jfr/event/gc/objectcount/TestObjectCountEvent.java
@@ -40,7 +40,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseSerialGC -XX:-UseCompressedOops -XX:MarkSweepDeadRatio=0 -XX:+IgnoreUnrecognizedVMOptions jdk.jfr.event.gc.objectcount.TestObjectCountEvent
  */
 public class TestObjectCountEvent {
diff --git a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java
index 39e0d0f84c0..9ceb12a752e 100644
--- a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java
+++ b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSConcurrent.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC -XX:+UseConcMarkSweepGC -XX:+ExplicitGCInvokesConcurrent jdk.jfr.event.gc.refstat.TestRefStatEventWithCMSConcurrent
  */
 public class TestRefStatEventWithCMSConcurrent {
diff --git a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java
index ea32fd277ac..081e77aecc5 100644
--- a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java
+++ b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithCMSMarkSweep.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm  -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC -XX:+UseConcMarkSweepGC jdk.jfr.event.gc.refstat.TestRefStatEventWithCMSMarkSweep
  */
 public class TestRefStatEventWithCMSMarkSweep {
diff --git a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithDefNew.java b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithDefNew.java
index c4b2b29849b..2d7c4357ca6 100644
--- a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithDefNew.java
+++ b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithDefNew.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm  -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC -Xmx50m -Xmn2m -XX:+UseSerialGC jdk.jfr.event.gc.refstat.TestRefStatEventWithDefNew
  */
 public class TestRefStatEventWithDefNew {
diff --git a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1ConcurrentMark.java b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1ConcurrentMark.java
index be23de050e6..ace333f6e0b 100644
--- a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1ConcurrentMark.java
+++ b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1ConcurrentMark.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC -XX:+UseG1GC -XX:+ExplicitGCInvokesConcurrent jdk.jfr.event.gc.refstat.TestRefStatEventWithG1ConcurrentMark
  */
 public class TestRefStatEventWithG1ConcurrentMark {
diff --git a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1FullCollection.java b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1FullCollection.java
index 2287a1294c4..d7929d7f320 100644
--- a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1FullCollection.java
+++ b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1FullCollection.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC -XX:+UseG1GC jdk.jfr.event.gc.refstat.TestRefStatEventWithG1FullCollection
  */
 public class TestRefStatEventWithG1FullCollection {
diff --git a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1New.java b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1New.java
index 50f8bf917bb..6bd10884369 100644
--- a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1New.java
+++ b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithG1New.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC -Xmx50m -Xmn2m -XX:+UseG1GC jdk.jfr.event.gc.refstat.TestRefStatEventWithG1New
  */
 public class TestRefStatEventWithG1New {
diff --git a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithPSMarkSweep.java b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithPSMarkSweep.java
index 19cec3226cc..28ec2815526 100644
--- a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithPSMarkSweep.java
+++ b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithPSMarkSweep.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC -XX:+UseParallelGC -XX:-UseParallelOldGC jdk.jfr.event.gc.refstat.TestRefStatEventWithPSMarkSweep
  */
 public class TestRefStatEventWithPSMarkSweep {
diff --git a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelOld.java b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelOld.java
index da83ce14d4e..1d2e8e1d3b6 100644
--- a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelOld.java
+++ b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelOld.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC -XX:+UseParallelGC -XX:+UseParallelOldGC jdk.jfr.event.gc.refstat.TestRefStatEventWithParallelOld
  */
 public class TestRefStatEventWithParallelOld {
diff --git a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelScavenge.java b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelScavenge.java
index e2a95b5ee9e..ed90d25063a 100644
--- a/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelScavenge.java
+++ b/jdk/test/jdk/jfr/event/gc/refstat/TestRefStatEventWithParallelScavenge.java
@@ -31,7 +31,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+PrintGCDetails -XX:+PrintGC -Xmx50m -Xmn2m -XX:-UseLargePages -XX:+UseParallelGC -XX:-UseAdaptiveSizePolicy jdk.jfr.event.gc.refstat.TestRefStatEventWithParallelScavenge
  */
 public class TestRefStatEventWithParallelScavenge {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java
index febaa531614..fa8efdc0786 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestConcMarkSweepAllocationPendingStackTrace.java
@@ -30,7 +30,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:MaxNewSize=10M -Xmx64M -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.stacktrace.TestConcMarkSweepAllocationPendingStackTrace
  */
 public class TestConcMarkSweepAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java
index 3af2fa56a5b..fa45851016d 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestDefNewAllocationPendingStackTrace.java
@@ -30,7 +30,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseSerialGC -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.stacktrace.TestDefNewAllocationPendingStackTrace
  */
 public class TestDefNewAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java
index e882f9e382e..32d02c4cfcb 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1HumongousAllocationPendingStackTrace.java
@@ -30,7 +30,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGC -Xmx64M -XX:InitiatingHeapOccupancyPercent=100 jdk.jfr.event.gc.stacktrace.TestG1HumongousAllocationPendingStackTrace
  */
 public class TestG1HumongousAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java
index 62c974eb51a..f8c8e0fc727 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1OldAllocationPendingStackTrace.java
@@ -30,7 +30,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:MaxNewSize=10M -Xmx128M -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.stacktrace.TestG1OldAllocationPendingStackTrace
  */
 public class TestG1OldAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java
index 26296bd8e55..82276dba025 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestG1YoungAllocationPendingStackTrace.java
@@ -30,7 +30,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.stacktrace.TestG1YoungAllocationPendingStackTrace
  */
 public class TestG1YoungAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java
index 070a5448f3f..ece6ff9fc7b 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestMarkSweepCompactAllocationPendingStackTrace.java
@@ -30,7 +30,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:MaxNewSize=10M -Xmx64M -XX:+UseSerialGC -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.stacktrace.TestMarkSweepCompactAllocationPendingStackTrace
  */
 public class TestMarkSweepCompactAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java
index 3143a82ee76..f454d8f23c9 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:MaxMetaspaceSize=64M -XX:+PrintGCDetails -XX:+PrintGC jdk.jfr.event.gc.stacktrace.TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace
  */
 public class TestMetaspaceConcMarkSweepGCAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java
index 1b533e062a8..9579739ab36 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceG1GCAllocationPendingStackTrace.java
@@ -30,7 +30,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseG1GC -XX:+PrintGCDetails -XX:+PrintGC -XX:MaxMetaspaceSize=64M jdk.jfr.event.gc.stacktrace.TestMetaspaceG1GCAllocationPendingStackTrace
  */
 
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java
index 1a3c2659305..dc8938bf5d4 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceParallelGCAllocationPendingStackTrace.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseParallelGC -XX:+PrintGCDetails -XX:+PrintGC -XX:MaxMetaspaceSize=64M jdk.jfr.event.gc.stacktrace.TestMetaspaceParallelGCAllocationPendingStackTrace
  */
 public class TestMetaspaceParallelGCAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java
index 941e185f2ee..69725ec2b60 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestMetaspaceSerialGCAllocationPendingStackTrace.java
@@ -31,7 +31,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseSerialGC -XX:+PrintGCDetails -XX:+PrintGC -XX:MaxMetaspaceSize=64M -XX:+FlightRecorder jdk.jfr.event.gc.stacktrace.TestMetaspaceSerialGCAllocationPendingStackTrace
  */
 public class TestMetaspaceSerialGCAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java
index e1ccb303af5..54195d5deca 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestParNewAllocationPendingStackTrace.java
@@ -30,7 +30,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseConcMarkSweepGC -XX:+PrintGCDetails -XX:+PrintGC -XX:+FlightRecorder jdk.jfr.event.gc.stacktrace.TestParNewAllocationPendingStackTrace
  */
 public class TestParNewAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java
index fcc0b1912c4..3ca65dfe5fe 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestParallelMarkSweepAllocationPendingStackTrace.java
@@ -30,7 +30,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:MaxNewSize=10M -Xmx64M -XX:+UseParallelGC -XX:+PrintGCDetails -XX:+PrintGC -XX:+FlightRecorder jdk.jfr.event.gc.stacktrace.TestParallelMarkSweepAllocationPendingStackTrace
  */
 public class TestParallelMarkSweepAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java b/jdk/test/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java
index b5a771d3e0d..6d24aa7febd 100644
--- a/jdk/test/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java
+++ b/jdk/test/jdk/jfr/event/gc/stacktrace/TestParallelScavengeAllocationPendingStackTrace.java
@@ -30,7 +30,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseParallelGC -XX:+PrintGCDetails -XX:+PrintGC -XX:+FlightRecorder jdk.jfr.event.gc.stacktrace.TestParallelScavengeAllocationPendingStackTrace
  */
 public class TestParallelScavengeAllocationPendingStackTrace {
diff --git a/jdk/test/jdk/jfr/event/io/EvilInstrument.java b/jdk/test/jdk/jfr/event/io/EvilInstrument.java
index e2a18c0bd2e..5b9bd345426 100644
--- a/jdk/test/jdk/jfr/event/io/EvilInstrument.java
+++ b/jdk/test/jdk/jfr/event/io/EvilInstrument.java
@@ -49,7 +49,7 @@
  * instrumentation in JFR does not interfere with javaagents.
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  *
  * @build jdk.jfr.event.io.EvilInstrument
diff --git a/jdk/test/jdk/jfr/event/io/TestDisabledEvents.java b/jdk/test/jdk/jfr/event/io/TestDisabledEvents.java
index bbaf9269b96..8f9d12affd3 100644
--- a/jdk/test/jdk/jfr/event/io/TestDisabledEvents.java
+++ b/jdk/test/jdk/jfr/event/io/TestDisabledEvents.java
@@ -45,7 +45,7 @@
  * @summary Test with FlightRecorder enabled but with the events disabled.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.io.TestDisabledEvents
  */
 
diff --git a/jdk/test/jdk/jfr/event/io/TestFileChannelEvents.java b/jdk/test/jdk/jfr/event/io/TestFileChannelEvents.java
index 6c849e2c57d..3349c318d1f 100644
--- a/jdk/test/jdk/jfr/event/io/TestFileChannelEvents.java
+++ b/jdk/test/jdk/jfr/event/io/TestFileChannelEvents.java
@@ -44,7 +44,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.io.TestFileChannelEvents
  */
 public class TestFileChannelEvents {
diff --git a/jdk/test/jdk/jfr/event/io/TestFileReadOnly.java b/jdk/test/jdk/jfr/event/io/TestFileReadOnly.java
index 85fcd123e3a..559cdff1705 100644
--- a/jdk/test/jdk/jfr/event/io/TestFileReadOnly.java
+++ b/jdk/test/jdk/jfr/event/io/TestFileReadOnly.java
@@ -45,7 +45,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.io.TestFileReadOnly
  */
 public class TestFileReadOnly {
diff --git a/jdk/test/jdk/jfr/event/io/TestFileStreamEvents.java b/jdk/test/jdk/jfr/event/io/TestFileStreamEvents.java
index d647560fbed..ec944e3bacf 100644
--- a/jdk/test/jdk/jfr/event/io/TestFileStreamEvents.java
+++ b/jdk/test/jdk/jfr/event/io/TestFileStreamEvents.java
@@ -43,7 +43,7 @@
  * @test TestFileStreamEvents
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.io.TestFileStreamEvents
  */
 
diff --git a/jdk/test/jdk/jfr/event/io/TestInstrumentation.java b/jdk/test/jdk/jfr/event/io/TestInstrumentation.java
index 19fe5a6dae8..d6f14a9d74d 100644
--- a/jdk/test/jdk/jfr/event/io/TestInstrumentation.java
+++ b/jdk/test/jdk/jfr/event/io/TestInstrumentation.java
@@ -49,7 +49,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
 
  *
diff --git a/jdk/test/jdk/jfr/event/io/TestRandomAccessFileEvents.java b/jdk/test/jdk/jfr/event/io/TestRandomAccessFileEvents.java
index 2798338a635..a0b65d7f0d5 100644
--- a/jdk/test/jdk/jfr/event/io/TestRandomAccessFileEvents.java
+++ b/jdk/test/jdk/jfr/event/io/TestRandomAccessFileEvents.java
@@ -42,7 +42,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.io.TestRandomAccessFileEvents
  */
 public class TestRandomAccessFileEvents {
diff --git a/jdk/test/jdk/jfr/event/io/TestRandomAccessFileThread.java b/jdk/test/jdk/jfr/event/io/TestRandomAccessFileThread.java
index 21b79966c55..959da5e64d0 100644
--- a/jdk/test/jdk/jfr/event/io/TestRandomAccessFileThread.java
+++ b/jdk/test/jdk/jfr/event/io/TestRandomAccessFileThread.java
@@ -48,7 +48,7 @@
  * @summary Verify the event time stamp and thread name
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps jdk.jfr.event.io.TestRandomAccessFileThread
  */
 
diff --git a/jdk/test/jdk/jfr/event/io/TestSocketChannelEvents.java b/jdk/test/jdk/jfr/event/io/TestSocketChannelEvents.java
index 23b692a3100..25267730e42 100644
--- a/jdk/test/jdk/jfr/event/io/TestSocketChannelEvents.java
+++ b/jdk/test/jdk/jfr/event/io/TestSocketChannelEvents.java
@@ -45,7 +45,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.io.TestSocketChannelEvents
  */
 public class TestSocketChannelEvents {
diff --git a/jdk/test/jdk/jfr/event/io/TestSocketEvents.java b/jdk/test/jdk/jfr/event/io/TestSocketEvents.java
index 5b544cc7e92..d7797b0c234 100644
--- a/jdk/test/jdk/jfr/event/io/TestSocketEvents.java
+++ b/jdk/test/jdk/jfr/event/io/TestSocketEvents.java
@@ -46,7 +46,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.io.TestSocketEvents
  */
 public class TestSocketEvents {
diff --git a/jdk/test/jdk/jfr/event/metadata/TestDefaultConfigurations.java b/jdk/test/jdk/jfr/event/metadata/TestDefaultConfigurations.java
index 0d19419b1dd..f372491231b 100644
--- a/jdk/test/jdk/jfr/event/metadata/TestDefaultConfigurations.java
+++ b/jdk/test/jdk/jfr/event/metadata/TestDefaultConfigurations.java
@@ -58,7 +58,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
 
  *
diff --git a/jdk/test/jdk/jfr/event/metadata/TestEventMetadata.java b/jdk/test/jdk/jfr/event/metadata/TestEventMetadata.java
index c6811c5a782..9394949de23 100644
--- a/jdk/test/jdk/jfr/event/metadata/TestEventMetadata.java
+++ b/jdk/test/jdk/jfr/event/metadata/TestEventMetadata.java
@@ -39,7 +39,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.metadata.TestEventMetadata
  */
 
diff --git a/jdk/test/jdk/jfr/event/metadata/TestLookForUntestedEvents.java b/jdk/test/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
index 93e4e4aae5f..3babcbae3c1 100644
--- a/jdk/test/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
+++ b/jdk/test/jdk/jfr/event/metadata/TestLookForUntestedEvents.java
@@ -45,7 +45,7 @@
 /**
  * @test Check for JFR events not covered by tests
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main jdk.jfr.event.metadata.TestLookForUntestedEvents
  */
 public class TestLookForUntestedEvents {
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestAllocationTime.java b/jdk/test/jdk/jfr/event/oldobject/TestAllocationTime.java
index d82ab849db9..850f6f9efed 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestAllocationTime.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestAllocationTime.java
@@ -42,7 +42,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm  -XX:TLABSize=2k -XX:-FastTLABRefill jdk.jfr.event.oldobject.TestAllocationTime
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestArrayInformation.java b/jdk/test/jdk/jfr/event/oldobject/TestArrayInformation.java
index 1c6050d0218..61f30eb16f7 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestArrayInformation.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestArrayInformation.java
@@ -41,7 +41,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestArrayInformation
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestCMS.java b/jdk/test/jdk/jfr/event/oldobject/TestCMS.java
index 2ee8140093f..1675dc37d55 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestCMS.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestCMS.java
@@ -40,7 +40,7 @@
  *
  *
  * @summary Test leak profiler with CMS GC
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm  -XX:TLABSize=2k -XX:+UseConcMarkSweepGC jdk.jfr.event.oldobject.TestCMS
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestCircularReference.java b/jdk/test/jdk/jfr/event/oldobject/TestCircularReference.java
index b068bdb2cb7..27cb2fe4224 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestCircularReference.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestCircularReference.java
@@ -38,7 +38,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestCircularReference
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestClassLoaderLeak.java b/jdk/test/jdk/jfr/event/oldobject/TestClassLoaderLeak.java
index b2bb60fbcd3..7e20c4a2334 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestClassLoaderLeak.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestClassLoaderLeak.java
@@ -43,7 +43,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k -Xmx64m jdk.jfr.event.oldobject.TestClassLoaderLeak
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestFieldInformation.java b/jdk/test/jdk/jfr/event/oldobject/TestFieldInformation.java
index 4d20728cfdf..051a8dd5ec3 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestFieldInformation.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestFieldInformation.java
@@ -43,7 +43,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k -XX:+PrintGCDetails -XX:+PrintGC  -verbose:class jdk.jfr.event.oldobject.TestFieldInformation
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestG1.java b/jdk/test/jdk/jfr/event/oldobject/TestG1.java
index 238971fe516..9db5aaf6d4f 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestG1.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestG1.java
@@ -40,7 +40,7 @@
  *
  *
  * @summary Test leak profiler with G1 GC
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm  -XX:TLABSize=2k -XX:+UseG1GC jdk.jfr.event.oldobject.TestG1
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestHeapDeep.java b/jdk/test/jdk/jfr/event/oldobject/TestHeapDeep.java
index 11f9df9d7bb..209560ffac6 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestHeapDeep.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestHeapDeep.java
@@ -38,7 +38,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestHeapDeep
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestHeapShallow.java b/jdk/test/jdk/jfr/event/oldobject/TestHeapShallow.java
index bb81e0c729a..4835360bfa9 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestHeapShallow.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestHeapShallow.java
@@ -37,7 +37,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestHeapShallow
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestLargeRootSet.java b/jdk/test/jdk/jfr/event/oldobject/TestLargeRootSet.java
index f2f29d45a6c..0b28bcce4d4 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestLargeRootSet.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestLargeRootSet.java
@@ -43,7 +43,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k -XX:-FastTLABRefill jdk.jfr.event.oldobject.TestLargeRootSet
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestLastKnownHeapUsage.java b/jdk/test/jdk/jfr/event/oldobject/TestLastKnownHeapUsage.java
index b2aa71f61d1..9ae58eb4b18 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestLastKnownHeapUsage.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestLastKnownHeapUsage.java
@@ -42,7 +42,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k -XX:-FastTLABRefill jdk.jfr.event.oldobject.TestLastKnownHeapUsage
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestListenerLeak.java b/jdk/test/jdk/jfr/event/oldobject/TestListenerLeak.java
index 54329e97fc7..7500ecd3067 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestListenerLeak.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestListenerLeak.java
@@ -39,7 +39,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestListenerLeak
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestMetadataRetention.java b/jdk/test/jdk/jfr/event/oldobject/TestMetadataRetention.java
index 269b59fa361..9574af0e122 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestMetadataRetention.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestMetadataRetention.java
@@ -48,7 +48,7 @@
  *
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @build jdk.jfr.event.oldobject.TestMetadataObject
  * @run main/othervm -XX:TLABSize=2k -Xmx16m jdk.jfr.event.oldobject.TestMetadataRetention
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestObjectDescription.java b/jdk/test/jdk/jfr/event/oldobject/TestObjectDescription.java
index cac1b4448a5..1e18eece283 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestObjectDescription.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestObjectDescription.java
@@ -44,7 +44,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestObjectDescription
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestParallel.java b/jdk/test/jdk/jfr/event/oldobject/TestParallel.java
index 797c9369b10..610a6b9e224 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestParallel.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestParallel.java
@@ -40,7 +40,7 @@
  *
  *
  * @summary Test leak profiler with Parallel GC
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm  -XX:TLABSize=2k -XX:+UseParallelGC jdk.jfr.event.oldobject.TestParallel
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestParallelOld.java b/jdk/test/jdk/jfr/event/oldobject/TestParallelOld.java
index 866818c7bd6..3d1d20e104a 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestParallelOld.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestParallelOld.java
@@ -40,7 +40,7 @@
  *
  *
  * @summary Test leak profiler with Parallel Old GC
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm  -XX:TLABSize=2k -XX:+UseParallelOldGC jdk.jfr.event.oldobject.TestParallelOld
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestReferenceChainLimit.java b/jdk/test/jdk/jfr/event/oldobject/TestReferenceChainLimit.java
index 20dd5933571..f1e6e4fe9fb 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestReferenceChainLimit.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestReferenceChainLimit.java
@@ -37,7 +37,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestReferenceChainLimit
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestSanityDefault.java b/jdk/test/jdk/jfr/event/oldobject/TestSanityDefault.java
index 6607c7800a4..4dacee21a7a 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestSanityDefault.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestSanityDefault.java
@@ -38,7 +38,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @summary Purpose of this test is to run leak profiler without command line tweaks or WhiteBox hacks until we succeed
  * @run main/othervm jdk.jfr.event.oldobject.TestSanityDefault
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestSerial.java b/jdk/test/jdk/jfr/event/oldobject/TestSerial.java
index e2cbc46bd33..3e7615258d7 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestSerial.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestSerial.java
@@ -40,7 +40,7 @@
  *
  *
  * @summary Test leak profiler with Serial GC
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm  -XX:TLABSize=2k -XX:+UseSerialGC jdk.jfr.event.oldobject.TestSerial
  */
diff --git a/jdk/test/jdk/jfr/event/oldobject/TestThreadLocalLeak.java b/jdk/test/jdk/jfr/event/oldobject/TestThreadLocalLeak.java
index b7c76f5e94b..a2c7f468bbf 100644
--- a/jdk/test/jdk/jfr/event/oldobject/TestThreadLocalLeak.java
+++ b/jdk/test/jdk/jfr/event/oldobject/TestThreadLocalLeak.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:TLABSize=2k jdk.jfr.event.oldobject.TestThreadLocalLeak
  */
diff --git a/jdk/test/jdk/jfr/event/os/TestCPUInformation.java b/jdk/test/jdk/jfr/event/os/TestCPUInformation.java
index d6a026b2cc7..17c8419cbc0 100644
--- a/jdk/test/jdk/jfr/event/os/TestCPUInformation.java
+++ b/jdk/test/jdk/jfr/event/os/TestCPUInformation.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.os.TestCPUInformation
  */
 public class TestCPUInformation {
diff --git a/jdk/test/jdk/jfr/event/os/TestCPULoad.java b/jdk/test/jdk/jfr/event/os/TestCPULoad.java
index 614889766f6..8372d6f3459 100644
--- a/jdk/test/jdk/jfr/event/os/TestCPULoad.java
+++ b/jdk/test/jdk/jfr/event/os/TestCPULoad.java
@@ -37,7 +37,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.os.TestCPULoad
  */
 public class TestCPULoad {
diff --git a/jdk/test/jdk/jfr/event/os/TestCPUTimeStampCounter.java b/jdk/test/jdk/jfr/event/os/TestCPUTimeStampCounter.java
index 00fefe729b8..8df44fb3551 100644
--- a/jdk/test/jdk/jfr/event/os/TestCPUTimeStampCounter.java
+++ b/jdk/test/jdk/jfr/event/os/TestCPUTimeStampCounter.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.os.TestCPUTimeStampCounter
  */
 public class TestCPUTimeStampCounter {
diff --git a/jdk/test/jdk/jfr/event/os/TestInitialEnvironmentVariable.sh b/jdk/test/jdk/jfr/event/os/TestInitialEnvironmentVariable.sh
index 08bfef99194..3ed4d391442 100644
--- a/jdk/test/jdk/jfr/event/os/TestInitialEnvironmentVariable.sh
+++ b/jdk/test/jdk/jfr/event/os/TestInitialEnvironmentVariable.sh
@@ -23,7 +23,7 @@
 # @test
 # @key jfr
 #
-# @library /lib /
+# @library /test/lib /
 # @build jdk.jfr.event.os.TestInitialEnvironmentVariable
 # @run shell TestInitialEnvironmentVariable.sh
 
diff --git a/jdk/test/jdk/jfr/event/os/TestOSInfo.java b/jdk/test/jdk/jfr/event/os/TestOSInfo.java
index 1629bcb08fa..498994c0801 100644
--- a/jdk/test/jdk/jfr/event/os/TestOSInfo.java
+++ b/jdk/test/jdk/jfr/event/os/TestOSInfo.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.os.TestOSInfo
  */
 public class TestOSInfo {
diff --git a/jdk/test/jdk/jfr/event/os/TestPhysicalMemoryEvent.java b/jdk/test/jdk/jfr/event/os/TestPhysicalMemoryEvent.java
index be224ad03ce..d1d4451c9f9 100644
--- a/jdk/test/jdk/jfr/event/os/TestPhysicalMemoryEvent.java
+++ b/jdk/test/jdk/jfr/event/os/TestPhysicalMemoryEvent.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.os.TestPhysicalMemoryEvent
  */
 public class TestPhysicalMemoryEvent {
diff --git a/jdk/test/jdk/jfr/event/os/TestSystemProcess.java b/jdk/test/jdk/jfr/event/os/TestSystemProcess.java
index 9d3f4bede0f..9419cd3a4f8 100644
--- a/jdk/test/jdk/jfr/event/os/TestSystemProcess.java
+++ b/jdk/test/jdk/jfr/event/os/TestSystemProcess.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.os.TestSystemProcess
  */
 public class TestSystemProcess {
diff --git a/jdk/test/jdk/jfr/event/os/TestThreadContextSwitches.java b/jdk/test/jdk/jfr/event/os/TestThreadContextSwitches.java
index bd70c581b8d..7b608107378 100644
--- a/jdk/test/jdk/jfr/event/os/TestThreadContextSwitches.java
+++ b/jdk/test/jdk/jfr/event/os/TestThreadContextSwitches.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.os.TestThreadContextSwitches
  */
 public class TestThreadContextSwitches {
diff --git a/jdk/test/jdk/jfr/event/profiling/TestFullStackTrace.java b/jdk/test/jdk/jfr/event/profiling/TestFullStackTrace.java
index 7236b5951ce..0d341c2eadd 100644
--- a/jdk/test/jdk/jfr/event/profiling/TestFullStackTrace.java
+++ b/jdk/test/jdk/jfr/event/profiling/TestFullStackTrace.java
@@ -42,7 +42,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.profiling.TestFullStackTrace
  */
 public class TestFullStackTrace {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestActiveRecordingEvent.java b/jdk/test/jdk/jfr/event/runtime/TestActiveRecordingEvent.java
index 7d4b786fa41..40f6244f159 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestActiveRecordingEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestActiveRecordingEvent.java
@@ -48,7 +48,7 @@
  * @summary Tests that the recording properties are properly reflected in the ActiveRecording event
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestActiveRecordingEvent
  */
 public final class TestActiveRecordingEvent {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestActiveSettingEvent.java b/jdk/test/jdk/jfr/event/runtime/TestActiveSettingEvent.java
index 3b3ff905367..f9c09758ac9 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestActiveSettingEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestActiveSettingEvent.java
@@ -45,7 +45,7 @@
  * @summary Tests that active setting are available in the ActiveSettingevent
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestActiveSettingEvent
  */
 public final class TestActiveSettingEvent {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java b/jdk/test/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java
index 58eee6c6edc..f8e50a5c434 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestBiasedLockRevocationEvents.java
@@ -41,7 +41,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm -XX:BiasedLockingStartupDelay=0 jdk.jfr.event.runtime.TestBiasedLockRevocationEvents
  */
diff --git a/jdk/test/jdk/jfr/event/runtime/TestClassDefineEvent.java b/jdk/test/jdk/jfr/event/runtime/TestClassDefineEvent.java
index 30f9320af7e..abdcd7b35e9 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestClassDefineEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestClassDefineEvent.java
@@ -40,7 +40,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm jdk.jfr.event.runtime.TestClassDefineEvent
  * @run main/othervm -XX:+AllowParallelDefineClass jdk.jfr.event.runtime.TestClassDefineEvent
diff --git a/jdk/test/jdk/jfr/event/runtime/TestClassLoadEvent.java b/jdk/test/jdk/jfr/event/runtime/TestClassLoadEvent.java
index b0719d20cc6..488b174e9c8 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestClassLoadEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestClassLoadEvent.java
@@ -41,7 +41,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm jdk.jfr.event.runtime.TestClassLoadEvent
  */
diff --git a/jdk/test/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java b/jdk/test/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java
index debf79f07c2..b669dd4d07f 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestClassLoaderStatsEvent.java
@@ -43,7 +43,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm jdk.jfr.event.runtime.TestClassLoaderStatsEvent
  */
diff --git a/jdk/test/jdk/jfr/event/runtime/TestClassLoadingStatisticsEvent.java b/jdk/test/jdk/jfr/event/runtime/TestClassLoadingStatisticsEvent.java
index 01777475827..ef271e9a546 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestClassLoadingStatisticsEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestClassLoadingStatisticsEvent.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm jdk.jfr.event.runtime.TestClassLoadingStatisticsEvent
  */
diff --git a/jdk/test/jdk/jfr/event/runtime/TestClassUnloadEvent.java b/jdk/test/jdk/jfr/event/runtime/TestClassUnloadEvent.java
index 4962778b32f..9470767fba9 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestClassUnloadEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestClassUnloadEvent.java
@@ -42,7 +42,7 @@
  * @summary The test verifies that a class unload event is created when class is unloaded
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @build jdk.jfr.event.runtime.TestClasses
  * @run main/othervm -XX:+PrintGCDetails -XX:+PrintGC  -verbose:class -Xmx16m jdk.jfr.event.runtime.TestClassUnloadEvent
  */
diff --git a/jdk/test/jdk/jfr/event/runtime/TestExceptionEvents.java b/jdk/test/jdk/jfr/event/runtime/TestExceptionEvents.java
index 3d0cc5c39cb..7a29c7481b4 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestExceptionEvents.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestExceptionEvents.java
@@ -42,7 +42,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestExceptionEvents
  */
 public class TestExceptionEvents {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestExceptionSubclass.java b/jdk/test/jdk/jfr/event/runtime/TestExceptionSubclass.java
index 320702ecb4a..8d817ecd42d 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestExceptionSubclass.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestExceptionSubclass.java
@@ -32,7 +32,7 @@
  * @key jfr
  * @bug 8013122
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestExceptionSubclass
  */
 public class TestExceptionSubclass {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestJavaBlockedEvent.java b/jdk/test/jdk/jfr/event/runtime/TestJavaBlockedEvent.java
index 9a1160e97cd..bb773b46c5e 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestJavaBlockedEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestJavaBlockedEvent.java
@@ -44,7 +44,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.event.runtime.TestJavaBlockedEvent
  */
diff --git a/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorInflateEvent.java b/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorInflateEvent.java
index d98b4ce21c4..34795e796ee 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorInflateEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorInflateEvent.java
@@ -42,7 +42,7 @@
  * @test TestJavaMonitorInflateEvent
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestJavaMonitorInflateEvent
  */
 public class TestJavaMonitorInflateEvent {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorWaitEvent.java b/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorWaitEvent.java
index ead5e7616c0..478bab50620 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorWaitEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorWaitEvent.java
@@ -42,7 +42,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestJavaMonitorWaitEvent
  */
 public class TestJavaMonitorWaitEvent {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorWaitTimeOut.java b/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorWaitTimeOut.java
index 16d69b9fd2b..c838ec06af6 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorWaitTimeOut.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestJavaMonitorWaitTimeOut.java
@@ -39,7 +39,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestJavaMonitorWaitTimeOut
  */
 public class TestJavaMonitorWaitTimeOut {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestJavaThreadStatisticsEvent.java b/jdk/test/jdk/jfr/event/runtime/TestJavaThreadStatisticsEvent.java
index 983afed8eb9..2a98e318073 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestJavaThreadStatisticsEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestJavaThreadStatisticsEvent.java
@@ -41,7 +41,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestJavaThreadStatisticsEvent
  */
 public class TestJavaThreadStatisticsEvent {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestJavaThreadStatisticsEventBean.java b/jdk/test/jdk/jfr/event/runtime/TestJavaThreadStatisticsEventBean.java
index 307fae7c60d..a97f7024b4e 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestJavaThreadStatisticsEventBean.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestJavaThreadStatisticsEventBean.java
@@ -41,7 +41,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.event.runtime.TestJavaThreadStatisticsEventBean
  */
diff --git a/jdk/test/jdk/jfr/event/runtime/TestNativeLibrariesEvent.java b/jdk/test/jdk/jfr/event/runtime/TestNativeLibrariesEvent.java
index 6956f5affa5..e5a660b77fd 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestNativeLibrariesEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestNativeLibrariesEvent.java
@@ -42,7 +42,7 @@
  * @bug 8216559
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestNativeLibrariesEvent
  */
 public class TestNativeLibrariesEvent {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestNetworkUtilizationEvent.java b/jdk/test/jdk/jfr/event/runtime/TestNetworkUtilizationEvent.java
index eaa43a7bfde..d0064ec53d0 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestNetworkUtilizationEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestNetworkUtilizationEvent.java
@@ -43,7 +43,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.event.runtime.TestNetworkUtilizationEvent
  */
diff --git a/jdk/test/jdk/jfr/event/runtime/TestSafepointEvents.java b/jdk/test/jdk/jfr/event/runtime/TestSafepointEvents.java
index 8aad064c032..bedfd858961 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestSafepointEvents.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestSafepointEvents.java
@@ -42,7 +42,7 @@
  * @test TestSafepointEvents
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  *     sun.hotspot.WhiteBox$WhiteBoxPermission
diff --git a/jdk/test/jdk/jfr/event/runtime/TestShutdownEvent.java b/jdk/test/jdk/jfr/event/runtime/TestShutdownEvent.java
index 5bbf69cfde5..02f15c4bde1 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestShutdownEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestShutdownEvent.java
@@ -47,7 +47,7 @@
  * @test
  * @summary Test Shutdown event
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestShutdownEvent
  */
 public class TestShutdownEvent {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestSizeTFlags.java b/jdk/test/jdk/jfr/event/runtime/TestSizeTFlags.java
index 0650bc3c0e3..908ed6f968b 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestSizeTFlags.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestSizeTFlags.java
@@ -41,7 +41,7 @@
  *
  * @key jfr
  * @summary Test checks that flags of type size_t are being sent to the jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-UseFastUnorderedTimeStamps -XX:+UseG1GC -XX:+UseTLAB -XX:MinTLABSize=3k -XX:OldSize=30m -XX:YoungPLABSize=3k -XX:MaxDirectMemorySize=5M  jdk.jfr.event.runtime.TestSizeTFlags
  */
 public class TestSizeTFlags {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestSystemPropertyEvent.java b/jdk/test/jdk/jfr/event/runtime/TestSystemPropertyEvent.java
index e2c1b17ebda..efaf0e6f0fd 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestSystemPropertyEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestSystemPropertyEvent.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestSystemPropertyEvent
  */
 public class TestSystemPropertyEvent {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestThreadAllocationEvent.java b/jdk/test/jdk/jfr/event/runtime/TestThreadAllocationEvent.java
index c839de8f610..0528d1ca5b4 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestThreadAllocationEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestThreadAllocationEvent.java
@@ -47,7 +47,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  *
  * @run main/othervm -XX:-UseTLAB jdk.jfr.event.runtime.TestThreadAllocationEvent
diff --git a/jdk/test/jdk/jfr/event/runtime/TestThreadCpuTimeEvent.java b/jdk/test/jdk/jfr/event/runtime/TestThreadCpuTimeEvent.java
index bddbb3243c0..00f23549b9a 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestThreadCpuTimeEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestThreadCpuTimeEvent.java
@@ -47,7 +47,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  *
  * @run main/othervm jdk.jfr.event.runtime.TestThreadCpuTimeEvent
diff --git a/jdk/test/jdk/jfr/event/runtime/TestThreadDumpEvent.java b/jdk/test/jdk/jfr/event/runtime/TestThreadDumpEvent.java
index 971fc974daf..f0d29b7dc4b 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestThreadDumpEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestThreadDumpEvent.java
@@ -39,7 +39,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestThreadDumpEvent
  */
 public class TestThreadDumpEvent {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestThreadParkEvent.java b/jdk/test/jdk/jfr/event/runtime/TestThreadParkEvent.java
index 06c6b78bb56..97b0e106447 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestThreadParkEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestThreadParkEvent.java
@@ -48,7 +48,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.event.runtime.TestThreadParkEvent
  */
diff --git a/jdk/test/jdk/jfr/event/runtime/TestThreadSleepEvent.java b/jdk/test/jdk/jfr/event/runtime/TestThreadSleepEvent.java
index 53e97e7ac3d..593aff3e33e 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestThreadSleepEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestThreadSleepEvent.java
@@ -39,7 +39,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestThreadSleepEvent
  */
 public class TestThreadSleepEvent {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestThreadStartEndEvents.java b/jdk/test/jdk/jfr/event/runtime/TestThreadStartEndEvents.java
index fd028fb56c3..a8c81ee35bc 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestThreadStartEndEvents.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestThreadStartEndEvents.java
@@ -43,7 +43,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.event.runtime.TestThreadStartEndEvents
  */
 
diff --git a/jdk/test/jdk/jfr/event/runtime/TestThrowableInstrumentation.java b/jdk/test/jdk/jfr/event/runtime/TestThrowableInstrumentation.java
index 888d19ca68f..7534981fa56 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestThrowableInstrumentation.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestThrowableInstrumentation.java
@@ -34,7 +34,7 @@
  * @bug 8153324
  * @summary Verify instrumented Throwable bytecode by compiling it with C1.
  *
- * @library /lib /
+ * @library /test/lib /
  *
  *
  * @build  sun.hotspot.WhiteBox
diff --git a/jdk/test/jdk/jfr/event/runtime/TestVMInfoEvent.sh b/jdk/test/jdk/jfr/event/runtime/TestVMInfoEvent.sh
index 7beae562b01..835f203d335 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestVMInfoEvent.sh
+++ b/jdk/test/jdk/jfr/event/runtime/TestVMInfoEvent.sh
@@ -23,7 +23,7 @@
 # @test
 # @key jfr
 #
-# @library /lib /
+# @library /test/lib /
 # @build jdk.jfr.event.runtime.TestVMInfoEvent
 # @run shell TestVMInfoEvent.sh
 
diff --git a/jdk/test/jdk/jfr/event/runtime/TestVMOperation.java b/jdk/test/jdk/jfr/event/runtime/TestVMOperation.java
index 6dad4f9c14f..8862d900f00 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestVMOperation.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestVMOperation.java
@@ -39,7 +39,7 @@
  *
  *
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+UseParallelGC jdk.jfr.event.runtime.TestVMOperation
  */
 public class TestVMOperation {
diff --git a/jdk/test/jdk/jfr/event/runtime/TestVmFlagChangedEvent.java b/jdk/test/jdk/jfr/event/runtime/TestVmFlagChangedEvent.java
index e205b3dedd1..df8a2e433b1 100644
--- a/jdk/test/jdk/jfr/event/runtime/TestVmFlagChangedEvent.java
+++ b/jdk/test/jdk/jfr/event/runtime/TestVmFlagChangedEvent.java
@@ -41,7 +41,7 @@
  * @test TestVmFlagChangedEvent
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  *
  * @run main/othervm jdk.jfr.event.runtime.TestVmFlagChangedEvent
diff --git a/jdk/test/jdk/jfr/event/sampling/TestNative.java b/jdk/test/jdk/jfr/event/sampling/TestNative.java
index 02d69973917..6988f2a236a 100644
--- a/jdk/test/jdk/jfr/event/sampling/TestNative.java
+++ b/jdk/test/jdk/jfr/event/sampling/TestNative.java
@@ -41,8 +41,8 @@
  * @test
  * @key jfr
  *
- * @library /lib /
- *
+ * @library /test/lib /
+ * @build TestNative
  * @run shell TestNative.sh
  */
 public class TestNative {
diff --git a/jdk/test/jdk/jfr/event/sampling/TestNative.sh b/jdk/test/jdk/jfr/event/sampling/TestNative.sh
index b39d309b2e7..d6be43216f6 100644
--- a/jdk/test/jdk/jfr/event/sampling/TestNative.sh
+++ b/jdk/test/jdk/jfr/event/sampling/TestNative.sh
@@ -3,7 +3,7 @@
 set -ex
 
 OS=`uname -s`
-if [  "${OS}" != "Linux" -a "${OS}" != "Darwin" ]; then
+if [ "${OS}" != "Linux" ] && [ "${OS}" != "Darwin" ]; then
     echo "This is a Linux/MacOSX only test"
     exit 0;
 fi
@@ -27,13 +27,12 @@ if [ "x$TESTJAVA" = "x" ]; then
 fi
 
 JDK_TOPDIR="${TESTROOT}/.."
-JAVAC="${TESTJAVA}/bin/javac"
 JAVA="${TESTJAVA}/bin/java"
 TEST_ENV_SH="${JDK_TOPDIR}/../hotspot/test/test_env.sh"
 
 ls -l "${TEST_ENV_SH}"
 set +e
-  source "${TEST_ENV_SH}"
+  . "${TEST_ENV_SH}"
 set -e
 
 "${TESTGCC}" \
@@ -46,17 +45,6 @@ set -e
     -I${JDK_TOPDIR}/src/solaris/bin \
     ${TESTSRC}/libTestNative.c
 
-"${JAVAC}" -d ${TESTCLASSES} \
-           ${TESTROOT}/lib/jdk/test/lib/Utils.java \
-           ${TESTROOT}/lib/jdk/test/lib/JDKToolLauncher.java \
-           ${TESTROOT}/lib/jdk/test/lib/Platform.java \
-           ${TESTROOT}/lib/jdk/test/lib/Asserts.java \
-           ${TESTROOT}/lib/jdk/test/lib/jfr/EventNames.java \
-           ${TESTROOT}/lib/jdk/test/lib/JDKToolFinder.java \
-           ${TESTROOT}/lib/jdk/test/lib/process/*.java
-
-"${JAVAC}" -cp ${TESTCLASSPATH}:${TESTCLASSES} -d ${TESTCLASSES} ${TESTSRC}/TestNative.java
-
 "${JAVA}"  -Dtest.jdk=${TESTJAVA} \
            -Dtest.nativepath=${TESTCLASSES} \
            -Djava.library.path=${TESTCLASSES} \
diff --git a/jdk/test/jdk/jfr/javaagent/Test8252904.java b/jdk/test/jdk/jfr/javaagent/Test8252904.java
index bc9ec8bc628..b979166e50a 100644
--- a/jdk/test/jdk/jfr/javaagent/Test8252904.java
+++ b/jdk/test/jdk/jfr/javaagent/Test8252904.java
@@ -28,7 +28,7 @@
  * @key jfr
  * @summary Tests that JFR event classes can be transformed via JVMTI
  *
- * @library /lib/testlibrary /lib /
+ * @library /lib/testlibrary /test/lib /
  * @modules java.instrument
  *
  * @build jdk.jfr.javaagent.Test8252904
diff --git a/jdk/test/jdk/jfr/javaagent/TestLoadedAgent.java b/jdk/test/jdk/jfr/javaagent/TestLoadedAgent.java
index 90d80b2044f..2acb237fbb6 100644
--- a/jdk/test/jdk/jfr/javaagent/TestLoadedAgent.java
+++ b/jdk/test/jdk/jfr/javaagent/TestLoadedAgent.java
@@ -26,7 +26,7 @@
  * @key jfr
  * @summary Tests emitting events in a dynamically loaded Java agent
  *
- * @library /lib/testlibrary /lib /
+ * @library /lib/testlibrary /test/lib /
  * @modules java.instrument
  *
  * @build jdk.jfr.javaagent.EventEmitterAgent
diff --git a/jdk/test/jdk/jfr/javaagent/TestPremainAgent.java b/jdk/test/jdk/jfr/javaagent/TestPremainAgent.java
index 4ebf4293116..16d3f229800 100644
--- a/jdk/test/jdk/jfr/javaagent/TestPremainAgent.java
+++ b/jdk/test/jdk/jfr/javaagent/TestPremainAgent.java
@@ -26,7 +26,7 @@
  * @key jfr
  * @summary Tests emitting event before main using a Java agent
  *
- * @library /lib/testlibrary /lib /
+ * @library /lib/testlibrary /test/lib /
  * @modules java.instrument
  *
  * @build jdk.jfr.javaagent.EventEmitterAgent
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdConfigure.java b/jdk/test/jdk/jfr/jcmd/TestJcmdConfigure.java
index c2a54d22fcb..0912be1e228 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdConfigure.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdConfigure.java
@@ -38,7 +38,7 @@
  * @summary The test verifies JFR.configure command
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.jcmd.TestJcmdConfigure
  */
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdDump.java b/jdk/test/jdk/jfr/jcmd/TestJcmdDump.java
index b2f0d8c7057..c24dedc376d 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdDump.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdDump.java
@@ -43,7 +43,7 @@
  * @summary The test verifies JFR.dump command
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:FlightRecorderOptions:maxchunksize=1M jdk.jfr.jcmd.TestJcmdDump
  */
 public class TestJcmdDump {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdDumpGeneratedFilename.java b/jdk/test/jdk/jfr/jcmd/TestJcmdDumpGeneratedFilename.java
index 1ec9abbb16b..828522112e3 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdDumpGeneratedFilename.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdDumpGeneratedFilename.java
@@ -41,7 +41,7 @@
  * @summary The test verifies JFR.dump command
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jcmd.TestJcmdDumpGeneratedFilename
  */
 public class TestJcmdDumpGeneratedFilename {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdDumpLimited.java b/jdk/test/jdk/jfr/jcmd/TestJcmdDumpLimited.java
index c49f5c0995d..2b711fbf03e 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdDumpLimited.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdDumpLimited.java
@@ -48,7 +48,7 @@
  * @summary The test verifies JFR.dump command
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jcmd.TestJcmdDumpLimited
  */
 public class TestJcmdDumpLimited {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdDumpPathToGCRoots.java b/jdk/test/jdk/jfr/jcmd/TestJcmdDumpPathToGCRoots.java
index 5804772219f..cec76c04b80 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdDumpPathToGCRoots.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdDumpPathToGCRoots.java
@@ -46,7 +46,7 @@
  * @summary Start a recording with or without path-to-gc-roots
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @key jfr
  *
  * @run main/othervm -XX:TLABSize=2k jdk.jfr.jcmd.TestJcmdDumpPathToGCRoots
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdDumpWithFileName.java b/jdk/test/jdk/jfr/jcmd/TestJcmdDumpWithFileName.java
index 40ff35b4d98..6c70e790e9b 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdDumpWithFileName.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdDumpWithFileName.java
@@ -39,7 +39,7 @@
  * @test
  * @bug 8220657
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jcmd.TestJcmdDumpWithFileName
  */
 public class TestJcmdDumpWithFileName {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdLegacy.java b/jdk/test/jdk/jfr/jcmd/TestJcmdLegacy.java
index 4f86ab28ae7..45f3729c4ad 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdLegacy.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdLegacy.java
@@ -42,7 +42,7 @@
  * @test TestClassId
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.jcmd.TestJcmdLegacy
  */
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdSaveToFile.java b/jdk/test/jdk/jfr/jcmd/TestJcmdSaveToFile.java
index 5d2e91d3d2b..79e110f30e1 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdSaveToFile.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdSaveToFile.java
@@ -35,7 +35,7 @@
  * @summary The test verifies that recording can be written to a file both with JFR.start and JFR.stop
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jcmd.TestJcmdSaveToFile
  */
 public class TestJcmdSaveToFile {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdStartDirNotExist.java b/jdk/test/jdk/jfr/jcmd/TestJcmdStartDirNotExist.java
index 28318b9d663..9823ea9a3c9 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdStartDirNotExist.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdStartDirNotExist.java
@@ -35,7 +35,7 @@
  * @summary Verify error when starting with a dir that does not exist.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStartDirNotExist
  */
 public class TestJcmdStartDirNotExist {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdStartInvaldFile.java b/jdk/test/jdk/jfr/jcmd/TestJcmdStartInvaldFile.java
index 068005d4112..990618c93cf 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdStartInvaldFile.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdStartInvaldFile.java
@@ -32,7 +32,7 @@
  * @summary Verify error when starting with invalid file.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStartInvaldFile
  */
 public class TestJcmdStartInvaldFile {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdStartPathToGCRoots.java b/jdk/test/jdk/jfr/jcmd/TestJcmdStartPathToGCRoots.java
index 5d93f16fba0..668bc5502e5 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdStartPathToGCRoots.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdStartPathToGCRoots.java
@@ -36,7 +36,7 @@
  * @test
  * @summary Start a recording with or without path-to-gc-roots
  *
- * @library /lib /
+ * @library /test/lib /
  * @key jfr
  *
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStartPathToGCRoots
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdStartReadOnlyFile.java b/jdk/test/jdk/jfr/jcmd/TestJcmdStartReadOnlyFile.java
index 3a339d8ae39..7975021f884 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdStartReadOnlyFile.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdStartReadOnlyFile.java
@@ -36,7 +36,7 @@
  * @summary Verify error when starting with read-only file.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStartReadOnlyFile
  */
 public class TestJcmdStartReadOnlyFile {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdStartStopDefault.java b/jdk/test/jdk/jfr/jcmd/TestJcmdStartStopDefault.java
index d8ca538535a..3422d216bde 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdStartStopDefault.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdStartStopDefault.java
@@ -39,7 +39,7 @@
  * @summary Start a recording without name.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStartStopDefault
  */
 public class TestJcmdStartStopDefault {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdStartWithOptions.java b/jdk/test/jdk/jfr/jcmd/TestJcmdStartWithOptions.java
index f80cfeff339..d6a3c4434d4 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdStartWithOptions.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdStartWithOptions.java
@@ -37,7 +37,7 @@
  * @summary The test verifies that recording can be started with options delay|duration|maxage|maxsize
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:+FlightRecorder -XX:FlightRecorderOptions=maxchunksize=2097152 jdk.jfr.jcmd.TestJcmdStartWithOptions
  */
 public class TestJcmdStartWithOptions {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdStartWithSettings.java b/jdk/test/jdk/jfr/jcmd/TestJcmdStartWithSettings.java
index 976cde81045..19f5f930461 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdStartWithSettings.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdStartWithSettings.java
@@ -40,7 +40,7 @@
  * @summary The test verifies that recording can be started with setting file(s)
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStartWithSettings
  */
 public class TestJcmdStartWithSettings {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdStopInvalidFile.java b/jdk/test/jdk/jfr/jcmd/TestJcmdStopInvalidFile.java
index e3212d35b67..1fac204b1e8 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdStopInvalidFile.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdStopInvalidFile.java
@@ -32,7 +32,7 @@
  * @summary Verify error when stopping with invalid file.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStopInvalidFile
  */
 public class TestJcmdStopInvalidFile {
diff --git a/jdk/test/jdk/jfr/jcmd/TestJcmdStopReadOnlyFile.java b/jdk/test/jdk/jfr/jcmd/TestJcmdStopReadOnlyFile.java
index 2ede1ef33ae..bb88520d99b 100644
--- a/jdk/test/jdk/jfr/jcmd/TestJcmdStopReadOnlyFile.java
+++ b/jdk/test/jdk/jfr/jcmd/TestJcmdStopReadOnlyFile.java
@@ -36,7 +36,7 @@
  * @summary Verify error when stopping with read-only file.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jcmd.TestJcmdStopReadOnlyFile
  */
 public class TestJcmdStopReadOnlyFile {
diff --git a/jdk/test/jdk/jfr/jmx/TestClone.java b/jdk/test/jdk/jfr/jmx/TestClone.java
index d50b679fd47..7b1fae852bf 100644
--- a/jdk/test/jdk/jfr/jmx/TestClone.java
+++ b/jdk/test/jdk/jfr/jmx/TestClone.java
@@ -44,7 +44,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestClone
  */
 public class TestClone {
diff --git a/jdk/test/jdk/jfr/jmx/TestCloneRepeat.java b/jdk/test/jdk/jfr/jmx/TestCloneRepeat.java
index d8546837f0e..8d2d6c26b35 100644
--- a/jdk/test/jdk/jfr/jmx/TestCloneRepeat.java
+++ b/jdk/test/jdk/jfr/jmx/TestCloneRepeat.java
@@ -43,7 +43,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestCloneRepeat
  */
 public class TestCloneRepeat {
diff --git a/jdk/test/jdk/jfr/jmx/TestConfigurationInfo.java b/jdk/test/jdk/jfr/jmx/TestConfigurationInfo.java
index 4b9f2e92448..499d9508773 100644
--- a/jdk/test/jdk/jfr/jmx/TestConfigurationInfo.java
+++ b/jdk/test/jdk/jfr/jmx/TestConfigurationInfo.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestConfigurationInfo
  */
 public class TestConfigurationInfo {
diff --git a/jdk/test/jdk/jfr/jmx/TestCopyTo.java b/jdk/test/jdk/jfr/jmx/TestCopyTo.java
index 54bc791a6d1..7e3e41f62c9 100644
--- a/jdk/test/jdk/jfr/jmx/TestCopyTo.java
+++ b/jdk/test/jdk/jfr/jmx/TestCopyTo.java
@@ -39,7 +39,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestCopyTo
  */
 public class TestCopyTo {
diff --git a/jdk/test/jdk/jfr/jmx/TestCopyToInvalidPath.java b/jdk/test/jdk/jfr/jmx/TestCopyToInvalidPath.java
index 7d8e4f37aef..ba14bdb9e01 100644
--- a/jdk/test/jdk/jfr/jmx/TestCopyToInvalidPath.java
+++ b/jdk/test/jdk/jfr/jmx/TestCopyToInvalidPath.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestCopyToInvalidPath
  */
 public class TestCopyToInvalidPath {
diff --git a/jdk/test/jdk/jfr/jmx/TestCopyToReadOnlyDir.java b/jdk/test/jdk/jfr/jmx/TestCopyToReadOnlyDir.java
index 51efe66e9d2..39735ff4b7a 100644
--- a/jdk/test/jdk/jfr/jmx/TestCopyToReadOnlyDir.java
+++ b/jdk/test/jdk/jfr/jmx/TestCopyToReadOnlyDir.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestCopyToReadOnlyDir
  */
 public class TestCopyToReadOnlyDir {
diff --git a/jdk/test/jdk/jfr/jmx/TestCopyToRunning.java b/jdk/test/jdk/jfr/jmx/TestCopyToRunning.java
index df41634c42b..363c319847b 100644
--- a/jdk/test/jdk/jfr/jmx/TestCopyToRunning.java
+++ b/jdk/test/jdk/jfr/jmx/TestCopyToRunning.java
@@ -43,7 +43,7 @@
  * @key jfr
  * @summary Copy a recording to file while it is running.
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestCopyToRunning
  */
 public class TestCopyToRunning {
diff --git a/jdk/test/jdk/jfr/jmx/TestEventTypes.java b/jdk/test/jdk/jfr/jmx/TestEventTypes.java
index 2a20c43a4e4..6e34ad38912 100644
--- a/jdk/test/jdk/jfr/jmx/TestEventTypes.java
+++ b/jdk/test/jdk/jfr/jmx/TestEventTypes.java
@@ -47,7 +47,7 @@
  * @key jfr
  * @summary Verifies that EventTypes from jmx and FlightRecorder are the same.
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestEventTypes
  */
 public class TestEventTypes {
diff --git a/jdk/test/jdk/jfr/jmx/TestGetRecordings.java b/jdk/test/jdk/jfr/jmx/TestGetRecordings.java
index 71083690bc9..6f33cf4a7f9 100644
--- a/jdk/test/jdk/jfr/jmx/TestGetRecordings.java
+++ b/jdk/test/jdk/jfr/jmx/TestGetRecordings.java
@@ -34,7 +34,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestGetRecordings
  */
 public class TestGetRecordings {
diff --git a/jdk/test/jdk/jfr/jmx/TestGetRecordingsMultiple.java b/jdk/test/jdk/jfr/jmx/TestGetRecordingsMultiple.java
index 4817a1fe06d..79245f4f115 100644
--- a/jdk/test/jdk/jfr/jmx/TestGetRecordingsMultiple.java
+++ b/jdk/test/jdk/jfr/jmx/TestGetRecordingsMultiple.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestGetRecordingsMultiple
  */
 public class TestGetRecordingsMultiple {
diff --git a/jdk/test/jdk/jfr/jmx/TestMultipleRecordings.java b/jdk/test/jdk/jfr/jmx/TestMultipleRecordings.java
index dd05232d47c..e902e85b632 100644
--- a/jdk/test/jdk/jfr/jmx/TestMultipleRecordings.java
+++ b/jdk/test/jdk/jfr/jmx/TestMultipleRecordings.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestMultipleRecordings
  */
 public class TestMultipleRecordings {
diff --git a/jdk/test/jdk/jfr/jmx/TestNotificationListener.java b/jdk/test/jdk/jfr/jmx/TestNotificationListener.java
index 09b6cbd3929..c1daa731463 100644
--- a/jdk/test/jdk/jfr/jmx/TestNotificationListener.java
+++ b/jdk/test/jdk/jfr/jmx/TestNotificationListener.java
@@ -37,7 +37,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestNotificationListener
  */
 public class TestNotificationListener {
diff --git a/jdk/test/jdk/jfr/jmx/TestPredefinedConfiguration.java b/jdk/test/jdk/jfr/jmx/TestPredefinedConfiguration.java
index 2d7d6f21c10..21e5b890d98 100644
--- a/jdk/test/jdk/jfr/jmx/TestPredefinedConfiguration.java
+++ b/jdk/test/jdk/jfr/jmx/TestPredefinedConfiguration.java
@@ -37,7 +37,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestPredefinedConfiguration
  */
 public class TestPredefinedConfiguration {
diff --git a/jdk/test/jdk/jfr/jmx/TestPredefinedConfigurationInvalid.java b/jdk/test/jdk/jfr/jmx/TestPredefinedConfigurationInvalid.java
index f1a462e537b..7292b2fd2c8 100644
--- a/jdk/test/jdk/jfr/jmx/TestPredefinedConfigurationInvalid.java
+++ b/jdk/test/jdk/jfr/jmx/TestPredefinedConfigurationInvalid.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestPredefinedConfigurationInvalid
  */
 public class TestPredefinedConfigurationInvalid {
diff --git a/jdk/test/jdk/jfr/jmx/TestRecordingOptions.java b/jdk/test/jdk/jfr/jmx/TestRecordingOptions.java
index 37e09111c79..a63d9c45821 100644
--- a/jdk/test/jdk/jfr/jmx/TestRecordingOptions.java
+++ b/jdk/test/jdk/jfr/jmx/TestRecordingOptions.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestRecordingOptions
  */
 public class TestRecordingOptions {
diff --git a/jdk/test/jdk/jfr/jmx/TestRecordingSettings.java b/jdk/test/jdk/jfr/jmx/TestRecordingSettings.java
index 9365964592c..2de45f9410c 100644
--- a/jdk/test/jdk/jfr/jmx/TestRecordingSettings.java
+++ b/jdk/test/jdk/jfr/jmx/TestRecordingSettings.java
@@ -37,7 +37,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestRecordingSettings
  */
 public class TestRecordingSettings {
diff --git a/jdk/test/jdk/jfr/jmx/TestRecordingSettingsInvalid.java b/jdk/test/jdk/jfr/jmx/TestRecordingSettingsInvalid.java
index af787c883a5..a418e6ce86e 100644
--- a/jdk/test/jdk/jfr/jmx/TestRecordingSettingsInvalid.java
+++ b/jdk/test/jdk/jfr/jmx/TestRecordingSettingsInvalid.java
@@ -36,7 +36,7 @@
  * @key jfr
  * @summary Verify exception when setting invalid settings.
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestRecordingSettingsInvalid
  */
 public class TestRecordingSettingsInvalid {
diff --git a/jdk/test/jdk/jfr/jmx/TestRecordingSettingsMultiple.java b/jdk/test/jdk/jfr/jmx/TestRecordingSettingsMultiple.java
index 2f5838d2b77..615c6b0cc0a 100644
--- a/jdk/test/jdk/jfr/jmx/TestRecordingSettingsMultiple.java
+++ b/jdk/test/jdk/jfr/jmx/TestRecordingSettingsMultiple.java
@@ -34,7 +34,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestRecordingSettingsMultiple
  */
 public class TestRecordingSettingsMultiple {
diff --git a/jdk/test/jdk/jfr/jmx/TestRecordingState.java b/jdk/test/jdk/jfr/jmx/TestRecordingState.java
index 603cb6be357..1e69b8656ef 100644
--- a/jdk/test/jdk/jfr/jmx/TestRecordingState.java
+++ b/jdk/test/jdk/jfr/jmx/TestRecordingState.java
@@ -35,7 +35,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestRecordingState
  */
 public class TestRecordingState {
diff --git a/jdk/test/jdk/jfr/jmx/TestRecordingStateInvalid.java b/jdk/test/jdk/jfr/jmx/TestRecordingStateInvalid.java
index d1d2bbae9d1..920fcc53464 100644
--- a/jdk/test/jdk/jfr/jmx/TestRecordingStateInvalid.java
+++ b/jdk/test/jdk/jfr/jmx/TestRecordingStateInvalid.java
@@ -37,7 +37,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestRecordingStateInvalid
  */
 public class TestRecordingStateInvalid {
diff --git a/jdk/test/jdk/jfr/jmx/TestSetConfiguration.java b/jdk/test/jdk/jfr/jmx/TestSetConfiguration.java
index 013cfe8d4e6..6b916ed0bb2 100644
--- a/jdk/test/jdk/jfr/jmx/TestSetConfiguration.java
+++ b/jdk/test/jdk/jfr/jmx/TestSetConfiguration.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestSetConfiguration
  */
 public class TestSetConfiguration {
diff --git a/jdk/test/jdk/jfr/jmx/TestSetConfigurationInvalid.java b/jdk/test/jdk/jfr/jmx/TestSetConfigurationInvalid.java
index 89f92ab682d..928d2916ced 100644
--- a/jdk/test/jdk/jfr/jmx/TestSetConfigurationInvalid.java
+++ b/jdk/test/jdk/jfr/jmx/TestSetConfigurationInvalid.java
@@ -39,7 +39,7 @@
  * @key jfr
  * @summary Verify Exception when setting invalid config.
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestSetConfigurationInvalid
  */
 public class TestSetConfigurationInvalid {
diff --git a/jdk/test/jdk/jfr/jmx/TestSnapshot.java b/jdk/test/jdk/jfr/jmx/TestSnapshot.java
index 21ca15c34f5..095abb4bc19 100644
--- a/jdk/test/jdk/jfr/jmx/TestSnapshot.java
+++ b/jdk/test/jdk/jfr/jmx/TestSnapshot.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestSnapshot
  */
 public class TestSnapshot {
diff --git a/jdk/test/jdk/jfr/jmx/TestStartRecording.java b/jdk/test/jdk/jfr/jmx/TestStartRecording.java
index 4a3b19e4d15..bc05a832144 100644
--- a/jdk/test/jdk/jfr/jmx/TestStartRecording.java
+++ b/jdk/test/jdk/jfr/jmx/TestStartRecording.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestStartRecording
  */
 public class TestStartRecording {
diff --git a/jdk/test/jdk/jfr/jmx/TestStream.java b/jdk/test/jdk/jfr/jmx/TestStream.java
index f2c8ec5887a..e57e6d2e4ce 100644
--- a/jdk/test/jdk/jfr/jmx/TestStream.java
+++ b/jdk/test/jdk/jfr/jmx/TestStream.java
@@ -39,7 +39,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestStream
  */
 public class TestStream {
diff --git a/jdk/test/jdk/jfr/jmx/TestStreamClosed.java b/jdk/test/jdk/jfr/jmx/TestStreamClosed.java
index f9df6c6b988..231a411ee26 100644
--- a/jdk/test/jdk/jfr/jmx/TestStreamClosed.java
+++ b/jdk/test/jdk/jfr/jmx/TestStreamClosed.java
@@ -36,7 +36,7 @@
  * @key jfr
  * @summary Call readStream() after closeStream()
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestStreamClosed
  */
 public class TestStreamClosed {
diff --git a/jdk/test/jdk/jfr/jmx/TestStreamMultiple.java b/jdk/test/jdk/jfr/jmx/TestStreamMultiple.java
index 7a04ab77185..410f257d15e 100644
--- a/jdk/test/jdk/jfr/jmx/TestStreamMultiple.java
+++ b/jdk/test/jdk/jfr/jmx/TestStreamMultiple.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestStreamMultiple
  */
 public class TestStreamMultiple {
diff --git a/jdk/test/jdk/jfr/jmx/TestWrongId.java b/jdk/test/jdk/jfr/jmx/TestWrongId.java
index ccfd6c38aa0..134619a68b7 100644
--- a/jdk/test/jdk/jfr/jmx/TestWrongId.java
+++ b/jdk/test/jdk/jfr/jmx/TestWrongId.java
@@ -37,7 +37,7 @@
  * @key jfr
  * @summary Call functions with invalid argument id. Verify Exception.
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.TestWrongId
  */
 public class TestWrongId {
diff --git a/jdk/test/jdk/jfr/jmx/info/TestConfigurationInfo.java b/jdk/test/jdk/jfr/jmx/info/TestConfigurationInfo.java
index cd98e6e720c..77d0c69aed5 100644
--- a/jdk/test/jdk/jfr/jmx/info/TestConfigurationInfo.java
+++ b/jdk/test/jdk/jfr/jmx/info/TestConfigurationInfo.java
@@ -41,7 +41,7 @@
  * @key jfr
  * @summary Test for ConfigurationInfo. Compare infos from java API and jmx API.
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.info.TestConfigurationInfo
  */
 public class TestConfigurationInfo {
diff --git a/jdk/test/jdk/jfr/jmx/info/TestEventTypeInfo.java b/jdk/test/jdk/jfr/jmx/info/TestEventTypeInfo.java
index c5a26c50a36..fad76d46e79 100644
--- a/jdk/test/jdk/jfr/jmx/info/TestEventTypeInfo.java
+++ b/jdk/test/jdk/jfr/jmx/info/TestEventTypeInfo.java
@@ -43,7 +43,7 @@
  * @key jfr
  * @summary Test for EventTypeInfo
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.info.TestEventTypeInfo
  */
 public class TestEventTypeInfo {
diff --git a/jdk/test/jdk/jfr/jmx/info/TestRecordingInfo.java b/jdk/test/jdk/jfr/jmx/info/TestRecordingInfo.java
index f119d03b283..74c83064492 100644
--- a/jdk/test/jdk/jfr/jmx/info/TestRecordingInfo.java
+++ b/jdk/test/jdk/jfr/jmx/info/TestRecordingInfo.java
@@ -43,7 +43,7 @@
  * @key jfr
  * @summary Test for RecordingInfo
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.info.TestRecordingInfo
  */
 public class TestRecordingInfo {
diff --git a/jdk/test/jdk/jfr/jmx/info/TestSettingDescriptorInfo.java b/jdk/test/jdk/jfr/jmx/info/TestSettingDescriptorInfo.java
index b68c2c89eb4..f6da5fd56f0 100644
--- a/jdk/test/jdk/jfr/jmx/info/TestSettingDescriptorInfo.java
+++ b/jdk/test/jdk/jfr/jmx/info/TestSettingDescriptorInfo.java
@@ -42,7 +42,7 @@
  * @key jfr
  * @summary Test for SettingDescriptorInfo. Compare infos from java API and jmx API.
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jmx.info.TestSettingDescriptorInfo
  */
 public class TestSettingDescriptorInfo {
diff --git a/jdk/test/jdk/jfr/jmx/security/TestEnoughPermission.java b/jdk/test/jdk/jfr/jmx/security/TestEnoughPermission.java
index 5fc80b54543..a455ace2913 100644
--- a/jdk/test/jdk/jfr/jmx/security/TestEnoughPermission.java
+++ b/jdk/test/jdk/jfr/jmx/security/TestEnoughPermission.java
@@ -40,7 +40,7 @@
  * @key jfr
  * @summary Test with minimal needed permissions. All functions should work.
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=enough.policy jdk.jfr.jmx.security.TestEnoughPermission
  */
 public class TestEnoughPermission {
diff --git a/jdk/test/jdk/jfr/jmx/security/TestNoControlPermission.java b/jdk/test/jdk/jfr/jmx/security/TestNoControlPermission.java
index a6f0f4f7436..6522ea3ac1d 100644
--- a/jdk/test/jdk/jfr/jmx/security/TestNoControlPermission.java
+++ b/jdk/test/jdk/jfr/jmx/security/TestNoControlPermission.java
@@ -36,7 +36,7 @@
  * @key jfr
  * @summary Verify we get SecurityExceptions when missing management permission "control".
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=nocontrol.policy jdk.jfr.jmx.security.TestNoControlPermission
  */
 public class TestNoControlPermission {
diff --git a/jdk/test/jdk/jfr/jmx/security/TestNoMonitorPermission.java b/jdk/test/jdk/jfr/jmx/security/TestNoMonitorPermission.java
index 91eaedd70f3..35faae324bb 100644
--- a/jdk/test/jdk/jfr/jmx/security/TestNoMonitorPermission.java
+++ b/jdk/test/jdk/jfr/jmx/security/TestNoMonitorPermission.java
@@ -36,7 +36,7 @@
  * @key jfr
  * @summary Verify we get SecurityExceptions when missing management permission "monitor".
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=nomonitor.policy jdk.jfr.jmx.security.TestNoMonitorPermission
  */
 public class TestNoMonitorPermission {
diff --git a/jdk/test/jdk/jfr/jmx/security/TestNotificationListenerPermission.java b/jdk/test/jdk/jfr/jmx/security/TestNotificationListenerPermission.java
index 11f32f41c7e..d3f4418dc2e 100644
--- a/jdk/test/jdk/jfr/jmx/security/TestNotificationListenerPermission.java
+++ b/jdk/test/jdk/jfr/jmx/security/TestNotificationListenerPermission.java
@@ -42,7 +42,7 @@
  * @key jfr
  * @summary Test with minimal needed permissions. All functions should work.
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm/secure=java.lang.SecurityManager/java.security.policy=listener.policy jdk.jfr.jmx.security.TestNotificationListenerPermission
  */
 public class TestNotificationListenerPermission {
diff --git a/jdk/test/jdk/jfr/jvm/TestClassId.java b/jdk/test/jdk/jfr/jvm/TestClassId.java
index 2dd4a3d0f49..870c310fe86 100644
--- a/jdk/test/jdk/jfr/jvm/TestClassId.java
+++ b/jdk/test/jdk/jfr/jvm/TestClassId.java
@@ -35,7 +35,7 @@
  * @test TestClassId
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.jvm.TestClassId
  */
diff --git a/jdk/test/jdk/jfr/jvm/TestCounterTime.java b/jdk/test/jdk/jfr/jvm/TestCounterTime.java
index 0962a00230f..8690d5e3f8e 100644
--- a/jdk/test/jdk/jfr/jvm/TestCounterTime.java
+++ b/jdk/test/jdk/jfr/jvm/TestCounterTime.java
@@ -33,7 +33,7 @@
  * @test TestCounterTime
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.jvm.TestCounterTime
  */
diff --git a/jdk/test/jdk/jfr/jvm/TestCreateNative.java b/jdk/test/jdk/jfr/jvm/TestCreateNative.java
index f9a3f5157ee..2444345f8ab 100644
--- a/jdk/test/jdk/jfr/jvm/TestCreateNative.java
+++ b/jdk/test/jdk/jfr/jvm/TestCreateNative.java
@@ -35,7 +35,7 @@
  * @summary Checks that the JVM can rollback on native initialization failures.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.jvm.TestCreateNative
  */
diff --git a/jdk/test/jdk/jfr/jvm/TestDumpOnCrash.java b/jdk/test/jdk/jfr/jvm/TestDumpOnCrash.java
index b471cfd1603..ea4379c35d4 100644
--- a/jdk/test/jdk/jfr/jvm/TestDumpOnCrash.java
+++ b/jdk/test/jdk/jfr/jvm/TestDumpOnCrash.java
@@ -44,7 +44,7 @@
  * @summary Verifies that data associated with a running recording can be evacuated to an hs_err_pidXXX.jfr when the VM crashes
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
 
  *
diff --git a/jdk/test/jdk/jfr/jvm/TestGetAllEventClasses.java b/jdk/test/jdk/jfr/jvm/TestGetAllEventClasses.java
index 0d6e20f2b81..5d739a0513e 100644
--- a/jdk/test/jdk/jfr/jvm/TestGetAllEventClasses.java
+++ b/jdk/test/jdk/jfr/jvm/TestGetAllEventClasses.java
@@ -34,7 +34,7 @@
  * @test TestGetAllEventClasses
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  *
  * @build jdk.jfr.jvm.HelloWorldEvent1
diff --git a/jdk/test/jdk/jfr/jvm/TestGetEventWriter.java b/jdk/test/jdk/jfr/jvm/TestGetEventWriter.java
index 03293623584..3696ad08360 100644
--- a/jdk/test/jdk/jfr/jvm/TestGetEventWriter.java
+++ b/jdk/test/jdk/jfr/jvm/TestGetEventWriter.java
@@ -34,7 +34,7 @@
  * @test TestGetEventWriter
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  *
  * @run main/othervm jdk.jfr.jvm.TestGetEventWriter
diff --git a/jdk/test/jdk/jfr/jvm/TestGetStackTraceId.java b/jdk/test/jdk/jfr/jvm/TestGetStackTraceId.java
index 30aae4b7851..c4cf3ff5be9 100644
--- a/jdk/test/jdk/jfr/jvm/TestGetStackTraceId.java
+++ b/jdk/test/jdk/jfr/jvm/TestGetStackTraceId.java
@@ -33,7 +33,7 @@
  * @test TestGetStackTraceId
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.jvm.TestGetStackTraceId
  */
diff --git a/jdk/test/jdk/jfr/jvm/TestJFRIntrinsic.java b/jdk/test/jdk/jfr/jvm/TestJFRIntrinsic.java
index be41df51eca..01abf3040c8 100644
--- a/jdk/test/jdk/jfr/jvm/TestJFRIntrinsic.java
+++ b/jdk/test/jdk/jfr/jvm/TestJFRIntrinsic.java
@@ -28,7 +28,7 @@
  * @summary Intrinsic for JFR
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  *
  *
diff --git a/jdk/test/jdk/jfr/jvm/TestJavaEvent.java b/jdk/test/jdk/jfr/jvm/TestJavaEvent.java
index 635da6f6be1..093d6b6ec30 100644
--- a/jdk/test/jdk/jfr/jvm/TestJavaEvent.java
+++ b/jdk/test/jdk/jfr/jvm/TestJavaEvent.java
@@ -45,7 +45,7 @@
  * @test TestGetThreadId
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.jvm.TestJavaEvent
  */
diff --git a/jdk/test/jdk/jfr/jvm/TestLargeJavaEvent512k.java b/jdk/test/jdk/jfr/jvm/TestLargeJavaEvent512k.java
index bd86c87a47a..de309dac1cd 100644
--- a/jdk/test/jdk/jfr/jvm/TestLargeJavaEvent512k.java
+++ b/jdk/test/jdk/jfr/jvm/TestLargeJavaEvent512k.java
@@ -47,7 +47,7 @@
  * @test TestLargeJavaEvent512k
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.jvm.TestLargeJavaEvent512k
  */
diff --git a/jdk/test/jdk/jfr/jvm/TestLargeJavaEvent64k.java b/jdk/test/jdk/jfr/jvm/TestLargeJavaEvent64k.java
index c48762ac28a..2a5e4b3cbc2 100644
--- a/jdk/test/jdk/jfr/jvm/TestLargeJavaEvent64k.java
+++ b/jdk/test/jdk/jfr/jvm/TestLargeJavaEvent64k.java
@@ -47,7 +47,7 @@
  * @test TestLargeJavaEvent64k
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.jvm.TestLargeJavaEvent64k
  */
diff --git a/jdk/test/jdk/jfr/jvm/TestLogImplementation.java b/jdk/test/jdk/jfr/jvm/TestLogImplementation.java
index 3a928adcb2d..50ccf313b9b 100644
--- a/jdk/test/jdk/jfr/jvm/TestLogImplementation.java
+++ b/jdk/test/jdk/jfr/jvm/TestLogImplementation.java
@@ -34,7 +34,7 @@
  * @test TestLogImplementation
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.jvm.TestLogImplementation
  */
diff --git a/jdk/test/jdk/jfr/jvm/TestPid.java b/jdk/test/jdk/jfr/jvm/TestPid.java
index 5cd83cda0d0..92b981cd161 100644
--- a/jdk/test/jdk/jfr/jvm/TestPid.java
+++ b/jdk/test/jdk/jfr/jvm/TestPid.java
@@ -34,7 +34,7 @@
  * @test TestPid
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/othervm jdk.jfr.jvm.TestPid
  */
diff --git a/jdk/test/jdk/jfr/jvm/TestPrimitiveClasses.java b/jdk/test/jdk/jfr/jvm/TestPrimitiveClasses.java
index a555b18dd74..ef38d6b56e8 100644
--- a/jdk/test/jdk/jfr/jvm/TestPrimitiveClasses.java
+++ b/jdk/test/jdk/jfr/jvm/TestPrimitiveClasses.java
@@ -35,7 +35,7 @@
 /**
  * @test TestPrimitiveClasses
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.jvm.TestPrimitiveClasses
  */
 public class TestPrimitiveClasses {
diff --git a/jdk/test/jdk/jfr/jvm/TestUnloadEventClassCount.java b/jdk/test/jdk/jfr/jvm/TestUnloadEventClassCount.java
index c5987fc79b0..47fea5c3cf6 100644
--- a/jdk/test/jdk/jfr/jvm/TestUnloadEventClassCount.java
+++ b/jdk/test/jdk/jfr/jvm/TestUnloadEventClassCount.java
@@ -38,7 +38,7 @@
  * @summary Unit test for JVM#getUnloadedEventClassCount
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  *
  * @run main/othervm -XX:+PrintGCDetails -XX:+PrintGC  -verbose:class -Xmx16m jdk.jfr.jvm.TestUnloadEventClassCount
diff --git a/jdk/test/jdk/jfr/jvm/TestUnsupportedVM.java b/jdk/test/jdk/jfr/jvm/TestUnsupportedVM.java
index c2485d74689..5b5a4245e4e 100644
--- a/jdk/test/jdk/jfr/jvm/TestUnsupportedVM.java
+++ b/jdk/test/jdk/jfr/jvm/TestUnsupportedVM.java
@@ -71,7 +71,7 @@
  *
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -Dprepare-recording=true jdk.jfr.jvm.TestUnsupportedVM
  * @run main/othervm -Djfr.unsupported.vm=true jdk.jfr.jvm.TestUnsupportedVM
  */
diff --git a/jdk/test/jdk/jfr/security/JFRSecurityTestSuite.java b/jdk/test/jdk/jfr/security/JFRSecurityTestSuite.java
index 0c5eb4f7e99..d67dbdbbb40 100644
--- a/jdk/test/jdk/jfr/security/JFRSecurityTestSuite.java
+++ b/jdk/test/jdk/jfr/security/JFRSecurityTestSuite.java
@@ -68,7 +68,7 @@
 /*
  * @test
  * @requires (jdk.version.major >= 8)
- * @library /lib /
+ * @library /test/lib /
  * @key jfr
  * @run main/othervm/timeout=30 -XX:+FlightRecorder -XX:StartFlightRecording JFRSecurityTestSuite
  * @author Martin Balao (mbalao@redhat.com)
diff --git a/jdk/test/jdk/jfr/startupargs/TestBadOptionValues.java b/jdk/test/jdk/jfr/startupargs/TestBadOptionValues.java
index 4744178499e..b457e9d7c3b 100644
--- a/jdk/test/jdk/jfr/startupargs/TestBadOptionValues.java
+++ b/jdk/test/jdk/jfr/startupargs/TestBadOptionValues.java
@@ -35,7 +35,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
 
  *
diff --git a/jdk/test/jdk/jfr/startupargs/TestDumpOnExit.java b/jdk/test/jdk/jfr/startupargs/TestDumpOnExit.java
index 312c70d41eb..85fde363fef 100644
--- a/jdk/test/jdk/jfr/startupargs/TestDumpOnExit.java
+++ b/jdk/test/jdk/jfr/startupargs/TestDumpOnExit.java
@@ -43,7 +43,7 @@
  * @summary Start a FlightRecording with dumponexit. Verify dump exists.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.startupargs.TestDumpOnExit
  */
 public class TestDumpOnExit {
diff --git a/jdk/test/jdk/jfr/startupargs/TestMemoryOptions.java b/jdk/test/jdk/jfr/startupargs/TestMemoryOptions.java
index 934a0b97538..31725449749 100644
--- a/jdk/test/jdk/jfr/startupargs/TestMemoryOptions.java
+++ b/jdk/test/jdk/jfr/startupargs/TestMemoryOptions.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main/timeout=900 jdk.jfr.startupargs.TestMemoryOptions
  */
diff --git a/jdk/test/jdk/jfr/startupargs/TestMultipleStartupRecordings.java b/jdk/test/jdk/jfr/startupargs/TestMultipleStartupRecordings.java
index 4c156c8cfcf..174794ab298 100644
--- a/jdk/test/jdk/jfr/startupargs/TestMultipleStartupRecordings.java
+++ b/jdk/test/jdk/jfr/startupargs/TestMultipleStartupRecordings.java
@@ -34,7 +34,7 @@
  * @key jfr
  *
  *
- * @library /lib /
+ * @library /test/lib /
  *
  * @run main jdk.jfr.startupargs.TestMultipleStartupRecordings
  */
diff --git a/jdk/test/jdk/jfr/startupargs/TestOldObjectQueueSize.java b/jdk/test/jdk/jfr/startupargs/TestOldObjectQueueSize.java
index 6af49232a53..1c6ed4cece6 100644
--- a/jdk/test/jdk/jfr/startupargs/TestOldObjectQueueSize.java
+++ b/jdk/test/jdk/jfr/startupargs/TestOldObjectQueueSize.java
@@ -39,7 +39,7 @@
  * @summary Test -XX:FlightRecorderOptions=old-object-queue-size
  *
  *
- * @library /lib /
+ * @library /test/lib /
  * @key jfr
  *
  * @run main/othervm -XX:TLABSize=2k -XX:-FastTLABRefill -XX:FlightRecorderOptions=old-object-queue-size=0 jdk.jfr.startupargs.TestOldObjectQueueSize off
diff --git a/jdk/test/jdk/jfr/startupargs/TestRepositoryPath.java b/jdk/test/jdk/jfr/startupargs/TestRepositoryPath.java
index 56deefc611f..3df0a36d91a 100644
--- a/jdk/test/jdk/jfr/startupargs/TestRepositoryPath.java
+++ b/jdk/test/jdk/jfr/startupargs/TestRepositoryPath.java
@@ -36,7 +36,7 @@
  * @summary Set repository path. Verify recording created in repo.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:StartFlightRecording=name=TestStartRecording,settings=profile -XX:FlightRecorderOptions=repository=./repo jdk.jfr.startupargs.TestRepositoryPath
  */
 public class TestRepositoryPath {
diff --git a/jdk/test/jdk/jfr/startupargs/TestRepositoryPathLong.java b/jdk/test/jdk/jfr/startupargs/TestRepositoryPathLong.java
index 5a5176c56e3..72bb60ed90d 100644
--- a/jdk/test/jdk/jfr/startupargs/TestRepositoryPathLong.java
+++ b/jdk/test/jdk/jfr/startupargs/TestRepositoryPathLong.java
@@ -36,7 +36,7 @@
  * @summary Set repository path. Verify recording created in repo.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:StartFlightRecording=name=myrec,settings=profile -XX:FlightRecorderOptions=repository=./subdirectory/subdirectory1/subdirectory2/subdirectory3/subdirectory4/subdirectory5/subdirectory6/subdirectory7/subdirectory8/subdirectory9/subdirectory10/subdirectory11/subdirectory12/subdirectory13/subdirectory14/subdirectory15 jdk.jfr.startupargs.TestRepositoryPathLong
  */
 public class TestRepositoryPathLong {
diff --git a/jdk/test/jdk/jfr/startupargs/TestRetransform.java b/jdk/test/jdk/jfr/startupargs/TestRetransform.java
index 3703f276efa..af8f3083684 100644
--- a/jdk/test/jdk/jfr/startupargs/TestRetransform.java
+++ b/jdk/test/jdk/jfr/startupargs/TestRetransform.java
@@ -36,7 +36,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:FlightRecorderOptions=retransform=false jdk.jfr.startupargs.TestRetransform
  * @run main/othervm -XX:FlightRecorderOptions=retransform=true jdk.jfr.startupargs.TestRetransform
  */
diff --git a/jdk/test/jdk/jfr/startupargs/TestRetransformUsingLog.java b/jdk/test/jdk/jfr/startupargs/TestRetransformUsingLog.java
index c7aefbb9405..65e788c07de 100644
--- a/jdk/test/jdk/jfr/startupargs/TestRetransformUsingLog.java
+++ b/jdk/test/jdk/jfr/startupargs/TestRetransformUsingLog.java
@@ -38,7 +38,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.startupargs.TestRetransformUsingLog
  */
 public class TestRetransformUsingLog {
diff --git a/jdk/test/jdk/jfr/startupargs/TestStartDelay.java b/jdk/test/jdk/jfr/startupargs/TestStartDelay.java
index bd00da2e978..5fe8c26765e 100644
--- a/jdk/test/jdk/jfr/startupargs/TestStartDelay.java
+++ b/jdk/test/jdk/jfr/startupargs/TestStartDelay.java
@@ -38,7 +38,7 @@
  * @summary Start a recording with delay. Verify recording starts later.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:StartFlightRecording=name=TestStartDelay,delay=5000s jdk.jfr.startupargs.TestStartDelay
  */
 public class TestStartDelay {
diff --git a/jdk/test/jdk/jfr/startupargs/TestStartDelayRunning.java b/jdk/test/jdk/jfr/startupargs/TestStartDelayRunning.java
index 97af7fb211a..5e649514759 100644
--- a/jdk/test/jdk/jfr/startupargs/TestStartDelayRunning.java
+++ b/jdk/test/jdk/jfr/startupargs/TestStartDelayRunning.java
@@ -37,7 +37,7 @@
  * @summary Verify that a recopding with a delay is started.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:StartFlightRecording=name=TestStartDelay,delay=1s jdk.jfr.startupargs.TestStartDelayRunning
  */
 public class TestStartDelayRunning {
diff --git a/jdk/test/jdk/jfr/startupargs/TestStartDuration.java b/jdk/test/jdk/jfr/startupargs/TestStartDuration.java
index 8173a4d9839..b84f00fffb0 100644
--- a/jdk/test/jdk/jfr/startupargs/TestStartDuration.java
+++ b/jdk/test/jdk/jfr/startupargs/TestStartDuration.java
@@ -39,7 +39,7 @@
  * @summary Start a recording with duration. Verify recording stops.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main jdk.jfr.startupargs.TestStartDuration
  */
 public class TestStartDuration {
diff --git a/jdk/test/jdk/jfr/startupargs/TestStartMaxAgeSize.java b/jdk/test/jdk/jfr/startupargs/TestStartMaxAgeSize.java
index d1b0971b231..6897c2c0056 100644
--- a/jdk/test/jdk/jfr/startupargs/TestStartMaxAgeSize.java
+++ b/jdk/test/jdk/jfr/startupargs/TestStartMaxAgeSize.java
@@ -37,7 +37,7 @@
  * @summary Start a recording with delay. Verify recording starts later.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:StartFlightRecording=name=TestStartMaxAgeSize,maxage=10s,maxsize=1000000 jdk.jfr.startupargs.TestStartMaxAgeSize
  */
 public class TestStartMaxAgeSize {
diff --git a/jdk/test/jdk/jfr/startupargs/TestStartName.java b/jdk/test/jdk/jfr/startupargs/TestStartName.java
index 1c0e38d5f0f..6d376c7633f 100644
--- a/jdk/test/jdk/jfr/startupargs/TestStartName.java
+++ b/jdk/test/jdk/jfr/startupargs/TestStartName.java
@@ -34,7 +34,7 @@
  * @test
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main jdk.jfr.startupargs.TestStartName
  */
 public class TestStartName {
diff --git a/jdk/test/jdk/jfr/startupargs/TestStartNoSettings.java b/jdk/test/jdk/jfr/startupargs/TestStartNoSettings.java
index 9b452c93325..ce32ccac635 100644
--- a/jdk/test/jdk/jfr/startupargs/TestStartNoSettings.java
+++ b/jdk/test/jdk/jfr/startupargs/TestStartNoSettings.java
@@ -35,7 +35,7 @@
  * @test
  * @summary Start a FlightRecording without any settings (not even default).
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.startupargs.TestStartNoSettings
  *      -XX:StartFlightRecording=settings=none
  */
diff --git a/jdk/test/jdk/jfr/startupargs/TestStartRecording.java b/jdk/test/jdk/jfr/startupargs/TestStartRecording.java
index 104905c23d2..16abb088fde 100644
--- a/jdk/test/jdk/jfr/startupargs/TestStartRecording.java
+++ b/jdk/test/jdk/jfr/startupargs/TestStartRecording.java
@@ -37,7 +37,7 @@
  * @summary Start a recording with -XX:StartFlightRecording. Dump recording with jcmd.
  * @key jfr
  *
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm -XX:StartFlightRecording=name=TestStartRecording,settings=profile jdk.jfr.startupargs.TestStartRecording
  */
 public class TestStartRecording {
diff --git a/jdk/test/jdk/jfr/tool/TestAssemble.java b/jdk/test/jdk/jfr/tool/TestAssemble.java
index e1188c4b212..b2a6c2758b7 100644
--- a/jdk/test/jdk/jfr/tool/TestAssemble.java
+++ b/jdk/test/jdk/jfr/tool/TestAssemble.java
@@ -45,7 +45,7 @@
  * @test
  * @summary Test jfr reconstruct
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @modules jdk.jfr/jdk.jfr.internal
  * @run main/othervm jdk.jfr.tool.TestAssemble
  */
diff --git a/jdk/test/jdk/jfr/tool/TestDisassemble.java b/jdk/test/jdk/jfr/tool/TestDisassemble.java
index f749cd5f9cf..d73a4f50ea4 100644
--- a/jdk/test/jdk/jfr/tool/TestDisassemble.java
+++ b/jdk/test/jdk/jfr/tool/TestDisassemble.java
@@ -42,7 +42,7 @@
  * @test
  * @summary Test jfr split
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.tool.TestDisassemble
  */
 public class TestDisassemble {
diff --git a/jdk/test/jdk/jfr/tool/TestHelp.java b/jdk/test/jdk/jfr/tool/TestHelp.java
index ee5361ab11a..cc7122280eb 100644
--- a/jdk/test/jdk/jfr/tool/TestHelp.java
+++ b/jdk/test/jdk/jfr/tool/TestHelp.java
@@ -31,7 +31,7 @@
  * @test
  * @summary Test help
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.tool.TestHelp
  */
 public class TestHelp {
diff --git a/jdk/test/jdk/jfr/tool/TestMetadata.java b/jdk/test/jdk/jfr/tool/TestMetadata.java
index ee953e7738f..151095b245e 100644
--- a/jdk/test/jdk/jfr/tool/TestMetadata.java
+++ b/jdk/test/jdk/jfr/tool/TestMetadata.java
@@ -35,7 +35,7 @@
  * @test
  * @summary Test jfr info
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.tool.TestMetadata
  */
 public class TestMetadata {
diff --git a/jdk/test/jdk/jfr/tool/TestPrint.java b/jdk/test/jdk/jfr/tool/TestPrint.java
index 70401c5a392..f1fc42b0e2a 100644
--- a/jdk/test/jdk/jfr/tool/TestPrint.java
+++ b/jdk/test/jdk/jfr/tool/TestPrint.java
@@ -36,7 +36,7 @@
  * @test
  * @summary Test jfr print
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.tool.TestPrint
  */
 public class TestPrint {
diff --git a/jdk/test/jdk/jfr/tool/TestPrintDefault.java b/jdk/test/jdk/jfr/tool/TestPrintDefault.java
index 98f6484c87f..a366d563830 100644
--- a/jdk/test/jdk/jfr/tool/TestPrintDefault.java
+++ b/jdk/test/jdk/jfr/tool/TestPrintDefault.java
@@ -34,7 +34,7 @@
  * @key jfr
  * @summary Tests print --json
  *
- * @library /lib /
+ * @library /test/lib /
  * @modules java.scripting
  *          jdk.jfr
  *
diff --git a/jdk/test/jdk/jfr/tool/TestPrintJSON.java b/jdk/test/jdk/jfr/tool/TestPrintJSON.java
index 26f5e199af6..4cef144a81c 100644
--- a/jdk/test/jdk/jfr/tool/TestPrintJSON.java
+++ b/jdk/test/jdk/jfr/tool/TestPrintJSON.java
@@ -49,7 +49,7 @@
  * @key jfr
  * @summary Tests print --json
  *
- * @library /lib /
+ * @library /test/lib /
  * @modules jdk.scripting.nashorn
  *          jdk.jfr
  *
diff --git a/jdk/test/jdk/jfr/tool/TestPrintXML.java b/jdk/test/jdk/jfr/tool/TestPrintXML.java
index 589c8f4d62b..5e745c95cdd 100644
--- a/jdk/test/jdk/jfr/tool/TestPrintXML.java
+++ b/jdk/test/jdk/jfr/tool/TestPrintXML.java
@@ -64,7 +64,7 @@
  * @key jfr
  * @summary Tests print --xml
  *
- * @library /lib /
+ * @library /test/lib /
  * @modules java.scripting java.xml jdk.jfr
  *
  * @run main/othervm jdk.jfr.tool.TestPrintXML
diff --git a/jdk/test/jdk/jfr/tool/TestSummary.java b/jdk/test/jdk/jfr/tool/TestSummary.java
index b9dc94f178d..505c58f2d9e 100644
--- a/jdk/test/jdk/jfr/tool/TestSummary.java
+++ b/jdk/test/jdk/jfr/tool/TestSummary.java
@@ -35,7 +35,7 @@
  * @test
  * @summary Test jfr info
  * @key jfr
- * @library /lib /
+ * @library /test/lib /
  * @run main/othervm jdk.jfr.tool.TestSummary
  */
 public class TestSummary {
diff --git a/jdk/test/jdk/tools/launcher/JliLaunchTest.sh b/jdk/test/jdk/tools/launcher/JliLaunchTest.sh
index 8a149ee628e..667ad778fef 100644
--- a/jdk/test/jdk/tools/launcher/JliLaunchTest.sh
+++ b/jdk/test/jdk/tools/launcher/JliLaunchTest.sh
@@ -2,7 +2,7 @@
 
 # @test JliLaunchTest.sh
 # @bug 8238225
-# @library /lib
+# @library /test/lib
 # @build JliLaunchTest
 # @run shell JliLaunchTest.sh
 
diff --git a/jdk/test/lib/RedefineClassHelper.java b/jdk/test/lib/RedefineClassHelper.java
deleted file mode 100644
index 2c236907a7a..00000000000
--- a/jdk/test/lib/RedefineClassHelper.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-import java.io.PrintWriter;
-import java.lang.instrument.*;
-import jdk.test.lib.compiler.InMemoryJavaCompiler;
-
-/*
- * Helper class to write tests that redefine classes.
- * When main method is run, it will create a redefineagent.jar that can be used
- * with the -javaagent option to support redefining classes in jtreg tests.
- *
- * See sample test in test/testlibrary_tests/RedefineClassTest.java
- */
-public class RedefineClassHelper {
-
-    public static Instrumentation instrumentation;
-    public static void premain(String agentArgs, Instrumentation inst) {
-        instrumentation = inst;
-    }
-
-    /**
-     * Redefine a class
-     *
-     * @param clazz Class to redefine
-     * @param javacode String with the new java code for the class to be redefined
-     */
-    public static void redefineClass(Class clazz, String javacode) throws Exception {
-        byte[] bytecode = InMemoryJavaCompiler.compile(clazz.getName(), javacode);
-        redefineClass(clazz, bytecode);
-    }
-
-    /**
-     * Redefine a class
-     *
-     * @param clazz Class to redefine
-     * @param bytecode byte[] with the new class
-     */
-    public static void redefineClass(Class clazz, byte[] bytecode) throws Exception {
-        instrumentation.redefineClasses(new ClassDefinition(clazz, bytecode));
-    }
-
-    /**
-     * Main method to be invoked before test to create the redefineagent.jar
-     */
-    public static void main(String[] args) throws Exception {
-        ClassFileInstaller.main("RedefineClassHelper");
-
-        PrintWriter pw = new PrintWriter("MANIFEST.MF");
-        pw.println("Premain-Class: RedefineClassHelper");
-        pw.println("Can-Redefine-Classes: true");
-        pw.close();
-
-        sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar");
-        if (!jarTool.run(new String[] { "-cmf", "MANIFEST.MF", "redefineagent.jar", "RedefineClassHelper.class" })) {
-            throw new Exception("jar operation failed");
-        }
-    }
-}
diff --git a/jdk/test/lib/jdk/test/lib/SecurityTools.java b/jdk/test/lib/jdk/test/lib/SecurityTools.java
deleted file mode 100644
index 240801fb87f..00000000000
--- a/jdk/test/lib/jdk/test/lib/SecurityTools.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.test.lib;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import jdk.test.lib.process.OutputAnalyzer;
-import jdk.test.lib.process.ProcessTools;
-
-public class SecurityTools {
-
-    public static final String RESPONSE_FILE = "security_tools_response.txt";
-
-    private static ProcessBuilder getProcessBuilder(String tool, List<String> args) {
-        JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK(tool)
-                .addVMArg("-Duser.language=en")
-                .addVMArg("-Duser.country=US");
-        if (!Platform.isWindows()) {
-            launcher.addVMArg("-Djava.security.egd=file:/dev/./urandom");
-        }
-        for (String arg : args) {
-            if (arg.startsWith("-J")) {
-                launcher.addVMArg(arg.substring(2));
-            } else {
-                launcher.addToolArg(arg);
-            }
-        }
-        return new ProcessBuilder(launcher.getCommand());
-    }
-
-    // keytool
-
-    public static OutputAnalyzer keytool(List<String> args)
-            throws Exception {
-
-        ProcessBuilder pb = getProcessBuilder("keytool", args);
-
-        Path p = Paths.get(RESPONSE_FILE);
-        if (!Files.exists(p)) {
-            Files.createFile(p);
-        }
-        pb.redirectInput(ProcessBuilder.Redirect.from(new File(RESPONSE_FILE)));
-
-        try {
-            return execute(pb);
-        } finally {
-            Files.delete(p);
-        }
-    }
-
-    // Only call this if there is no white space in every argument
-    public static OutputAnalyzer keytool(String args) throws Exception {
-        return keytool(args.split("\\s+"));
-    }
-
-    public static OutputAnalyzer keytool(String... args) throws Exception {
-        return keytool(List.of(args));
-    }
-
-    public static void setResponse(String... responses) throws IOException {
-        String text;
-        if (responses.length > 0) {
-            text = Stream.of(responses).collect(
-                    Collectors.joining("\n", "", "\n"));
-        } else {
-            text = "";
-        }
-        Files.write(Paths.get(RESPONSE_FILE), text.getBytes());
-    }
-
-    // jarsigner
-
-    public static OutputAnalyzer jarsigner(List<String> args)
-            throws Exception {
-        return execute(getProcessBuilder("jarsigner", args));
-    }
-
-    private static OutputAnalyzer execute(ProcessBuilder pb) throws Exception {
-        try {
-            OutputAnalyzer oa = ProcessTools.executeCommand(pb);
-            System.out.println("Exit value: " + oa.getExitValue());
-            return oa;
-        } catch (Throwable t) {
-            if (t instanceof Exception) {
-                throw (Exception) t;
-            } else {
-                throw new Exception(t);
-            }
-        }
-    }
-
-    // Only call this if there is no white space in every argument
-    public static OutputAnalyzer jarsigner(String args) throws Exception {
-
-        return jarsigner(args.split("\\s+"));
-    }
-
-    public static OutputAnalyzer jarsigner(String... args) throws Exception {
-        return jarsigner(List.of(args));
-    }
-}
-
diff --git a/jdk/test/lib/jdk/test/lib/apps/LingeredApp.java b/jdk/test/lib/jdk/test/lib/apps/LingeredApp.java
deleted file mode 100644
index 0070dcfd717..00000000000
--- a/jdk/test/lib/jdk/test/lib/apps/LingeredApp.java
+++ /dev/null
@@ -1,518 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.test.lib.apps;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-import java.util.UUID;
-
-import jdk.test.lib.Utils;
-import jdk.test.lib.process.OutputBuffer;
-import jdk.test.lib.process.ProcessTools;
-import jdk.test.lib.process.StreamPumper;
-
-/**
- * This is a framework to launch an app that could be synchronized with caller
- * to make further attach actions reliable across supported platforms
-
- * Caller example:
- *   SmartTestApp a = SmartTestApp.startApp(cmd);
- *     // do something
- *   a.stopApp();
- *
- *   or fine grained control
- *
- *   a = new SmartTestApp("MyLock.lck");
- *   a.createLock();
- *   a.runApp();
- *   a.waitAppReady();
- *     // do something
- *   a.deleteLock();
- *   a.waitAppTerminate();
- *
- *  Then you can work with app output and process object
- *
- *   output = a.getAppOutput();
- *   process = a.getProcess();
- *
- */
-public class LingeredApp {
-
-    private static final long spinDelay = 1000;
-
-    private long lockCreationTime;
-    private ByteArrayOutputStream stderrBuffer;
-    private ByteArrayOutputStream stdoutBuffer;
-    private Thread outPumperThread;
-    private Thread errPumperThread;
-
-    protected Process appProcess;
-    protected OutputBuffer output;
-    protected static final int appWaitTime = 100;
-    protected final String lockFileName;
-
-    /**
-     * Create LingeredApp object on caller side. Lock file have be a valid filename
-     * at writable location
-     *
-     * @param lockFileName - the name of lock file
-     */
-    public LingeredApp(String lockFileName) {
-        this.lockFileName = lockFileName;
-    }
-
-    public LingeredApp() {
-        final String lockName = UUID.randomUUID().toString() + ".lck";
-        this.lockFileName = lockName;
-    }
-
-    /**
-     *
-     * @return name of lock file
-     */
-    public String getLockFileName() {
-        return this.lockFileName;
-    }
-
-    /**
-     *
-     * @return name of testapp
-     */
-    public String getAppName() {
-        return this.getClass().getName();
-    }
-
-    /**
-     *
-     *  @return pid of java process running testapp
-     */
-    public long getPid() {
-        if (appProcess == null) {
-            throw new RuntimeException("Process is not alive");
-        }
-        return appProcess.pid();
-    }
-
-    /**
-     *
-     * @return process object
-     */
-    public Process getProcess() {
-        return appProcess;
-    }
-
-    /**
-     *
-     * @return OutputBuffer object for the LingeredApp's output. Can only be called
-     * after LingeredApp has exited.
-     */
-    public OutputBuffer getOutput() {
-        if (appProcess.isAlive()) {
-            throw new RuntimeException("Process is still alive. Can't get its output.");
-        }
-        if (output == null) {
-            output = new OutputBuffer(stdoutBuffer.toString(), stderrBuffer.toString());
-        }
-        return output;
-    }
-
-    /*
-     * Capture all stdout and stderr output from the LingeredApp so it can be returned
-     * to the driver app later. This code is modeled after ProcessTools.getOutput().
-     */
-    private void startOutputPumpers() {
-        stderrBuffer = new ByteArrayOutputStream();
-        stdoutBuffer = new ByteArrayOutputStream();
-        StreamPumper outPumper = new StreamPumper(appProcess.getInputStream(), stdoutBuffer);
-        StreamPumper errPumper = new StreamPumper(appProcess.getErrorStream(), stderrBuffer);
-        outPumperThread = new Thread(outPumper);
-        errPumperThread = new Thread(errPumper);
-
-        outPumperThread.setDaemon(true);
-        errPumperThread.setDaemon(true);
-
-        outPumperThread.start();
-        errPumperThread.start();
-    }
-
-    /**
-     *
-     * @return application output as List. Empty List if application produced no output
-     */
-    public List<String> getAppOutput() {
-        if (appProcess.isAlive()) {
-            throw new RuntimeException("Process is still alive. Can't get its output.");
-        }
-        BufferedReader bufReader = new BufferedReader(new StringReader(output.getStdout()));
-        return bufReader.lines().collect(Collectors.toList());
-    }
-
-    /* Make sure all part of the app use the same method to get dates,
-     as different methods could produce different results
-     */
-    private static long epoch() {
-        return new Date().getTime();
-    }
-
-    private static long lastModified(String fileName) throws IOException {
-        Path path = Paths.get(fileName);
-        BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
-        return attr.lastModifiedTime().toMillis();
-    }
-
-    private static void setLastModified(String fileName, long newTime) throws IOException {
-        Path path = Paths.get(fileName);
-        FileTime fileTime = FileTime.fromMillis(newTime);
-        Files.setLastModifiedTime(path, fileTime);
-    }
-
-    /**
-     * create lock
-     *
-     * @throws IOException
-     */
-    public void createLock() throws IOException {
-        Path path = Paths.get(lockFileName);
-        // Files.deleteIfExists(path);
-        Files.createFile(path);
-        lockCreationTime = lastModified(lockFileName);
-    }
-
-    /**
-     * Delete lock
-     *
-     * @throws IOException
-     */
-    public void deleteLock() throws IOException {
-        try {
-            Path path = Paths.get(lockFileName);
-            Files.delete(path);
-        } catch (NoSuchFileException ex) {
-            // Lock already deleted. Ignore error
-        }
-    }
-
-    public void waitAppTerminate() {
-        // This code is modeled after tail end of ProcessTools.getOutput().
-        try {
-            // If the app hangs, we don't want to wait for the to test timeout.
-            if (!appProcess.waitFor(Utils.adjustTimeout(appWaitTime), TimeUnit.SECONDS)) {
-                appProcess.destroy();
-                appProcess.waitFor();
-            }
-            outPumperThread.join();
-            errPumperThread.join();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            // pass
-        }
-    }
-
-    /**
-     * The app touches the lock file when it's started
-     * wait while it happens. Caller have to delete lock on wait error.
-     *
-     * @param timeout
-     * @throws java.io.IOException
-     */
-    public void waitAppReady(long timeout) throws IOException {
-        long here = epoch();
-        while (true) {
-            long epoch = epoch();
-            if (epoch - here > (timeout * 1000)) {
-                throw new IOException("App waiting timeout");
-            }
-
-            // Live process should touch lock file every second
-            long lm = lastModified(lockFileName);
-            if (lm > lockCreationTime) {
-                break;
-            }
-
-            // Make sure process didn't already exit
-            if (!appProcess.isAlive()) {
-                throw new IOException("App exited unexpectedly with " + appProcess.exitValue());
-            }
-
-            try {
-                Thread.sleep(spinDelay);
-            } catch (InterruptedException ex) {
-                // pass
-            }
-        }
-    }
-
-    /**
-     * Analyze an environment and prepare a command line to
-     * run the app, app name should be added explicitly
-     */
-    public List<String> runAppPrepare(List<String> vmArguments) {
-        // We should always use testjava or throw an exception,
-        // so we can't use JDKToolFinder.getJDKTool("java");
-        // that falls back to compile java on error
-        String jdkPath = System.getProperty("test.jdk");
-        if (jdkPath == null) {
-            // we are not under jtreg, try env
-            Map<String, String> env = System.getenv();
-            jdkPath = env.get("TESTJAVA");
-        }
-
-        if (jdkPath == null) {
-            throw new RuntimeException("Can't determine jdk path neither test.jdk property no TESTJAVA env are set");
-        }
-
-        String osname = System.getProperty("os.name");
-        String javapath = jdkPath + ((osname.startsWith("window")) ? "/bin/java.exe" : "/bin/java");
-
-        List<String> cmd = new ArrayList<String>();
-        cmd.add(javapath);
-
-        if (vmArguments == null) {
-            // Propagate test.vm.options to LingeredApp, filter out possible empty options
-            String testVmOpts[] = System.getProperty("test.vm.opts","").split("\\s+");
-            for (String s : testVmOpts) {
-                if (!s.equals("")) {
-                    cmd.add(s);
-                }
-            }
-        } else {
-            // Lets user manage LingeredApp options
-            cmd.addAll(vmArguments);
-        }
-
-        // Make sure we set correct classpath to run the app
-        cmd.add("-cp");
-        String classpath = System.getProperty("test.class.path");
-        cmd.add((classpath == null) ? "." : classpath);
-
-        return cmd;
-    }
-
-    /**
-     * Assemble command line to a printable string
-     */
-    public void printCommandLine(List<String> cmd) {
-        // A bit of verbosity
-        StringBuilder cmdLine = new StringBuilder();
-        for (String strCmd : cmd) {
-            cmdLine.append("'").append(strCmd).append("' ");
-        }
-
-        System.err.println("Command line: [" + cmdLine.toString() + "]");
-    }
-
-    /**
-     * Run the app.
-     *
-     * @param vmArguments
-     * @throws IOException
-     */
-    public void runApp(List<String> vmArguments)
-            throws IOException {
-
-        List<String> cmd = runAppPrepare(vmArguments);
-
-        cmd.add(this.getAppName());
-        cmd.add(lockFileName);
-
-        printCommandLine(cmd);
-
-        ProcessBuilder pb = new ProcessBuilder(cmd);
-        // ProcessBuilder.start can throw IOException
-        appProcess = pb.start();
-
-        startOutputPumpers();
-    }
-
-    private void finishApp() {
-        OutputBuffer output = getOutput();
-        String msg =
-            " LingeredApp stdout: [" + output.getStdout() + "];\n" +
-            " LingeredApp stderr: [" + output.getStderr() + "]\n" +
-            " LingeredApp exitValue = " + appProcess.exitValue();
-
-        System.err.println(msg);
-    }
-
-    /**
-     * Delete lock file that signals app to terminate, then
-     * wait until app is actually terminated.
-     * @throws IOException
-     */
-    public void stopApp() throws IOException {
-        deleteLock();
-        // The startApp() of the derived app can throw
-        // an exception before the LA actually starts
-        if (appProcess != null) {
-            waitAppTerminate();
-            int exitcode = appProcess.exitValue();
-            if (exitcode != 0) {
-                throw new IOException("LingeredApp terminated with non-zero exit code " + exitcode);
-            }
-        }
-        finishApp();
-    }
-
-    /**
-     *  High level interface for test writers
-     */
-    /**
-     * Factory method that creates LingeredApp object with ready to use application
-     * lock name is autogenerated
-     * @param cmd - vm options, could be null to auto add testvm.options
-     * @return LingeredApp object
-     * @throws IOException
-     */
-    public static LingeredApp startApp(List<String> cmd) throws IOException {
-        LingeredApp a = new LingeredApp();
-        a.createLock();
-        try {
-            a.runApp(cmd);
-            a.waitAppReady(appWaitTime);
-        } catch (Exception ex) {
-            a.deleteLock();
-            System.err.println("LingeredApp failed to start: " + ex);
-            a.finishApp();
-            throw ex;
-        }
-
-        return a;
-    }
-
-    /**
-     * Factory method that starts pre-created LingeredApp
-     * lock name is autogenerated
-     * @param cmd - vm options, could be null to auto add testvm.options
-     * @param theApp - app to start
-     * @return LingeredApp object
-     * @throws IOException
-     */
-
-    public static void startApp(List<String> cmd, LingeredApp theApp) throws IOException {
-        theApp.createLock();
-        try {
-            theApp.runApp(cmd);
-            theApp.waitAppReady(appWaitTime);
-        } catch (Exception ex) {
-            theApp.deleteLock();
-            throw ex;
-        }
-    }
-
-    public static LingeredApp startApp() throws IOException {
-        return startApp(null);
-    }
-
-    public static void stopApp(LingeredApp app) throws IOException {
-        if (app != null) {
-            // LingeredApp can throw an exception during the intialization,
-            // make sure we don't have cascade NPE
-            app.stopApp();
-        }
-    }
-
-    /**
-     * LastModified time might not work correctly in some cases it might
-     * cause later failures
-     */
-
-    public static boolean isLastModifiedWorking() {
-        boolean sane = true;
-        try {
-            long lm = lastModified(".");
-            if (lm == 0) {
-                System.err.println("SANITY Warning! The lastModifiedTime() doesn't work on this system, it returns 0");
-                sane = false;
-            }
-
-            long now = epoch();
-            if (lm > now) {
-                System.err.println("SANITY Warning! The Clock is wrong on this system lastModifiedTime() > getTime()");
-                sane = false;
-            }
-
-            setLastModified(".", epoch());
-            long lm1 = lastModified(".");
-            if (lm1 <= lm) {
-                System.err.println("SANITY Warning! The setLastModified doesn't work on this system");
-                sane = false;
-            }
-        }
-        catch(IOException e) {
-            System.err.println("SANITY Warning! IOException during sanity check " + e);
-            sane = false;
-        }
-
-        return sane;
-    }
-
-    /**
-     * This part is the application it self
-     */
-    public static void main(String args[]) {
-
-        if (args.length != 1) {
-            System.err.println("Lock file name is not specified");
-            System.exit(7);
-        }
-
-        String theLockFileName = args[0];
-
-        try {
-            Path path = Paths.get(theLockFileName);
-
-            while (Files.exists(path)) {
-                // Touch the lock to indicate our readiness
-                setLastModified(theLockFileName, epoch());
-                Thread.sleep(spinDelay);
-            }
-        } catch (NoSuchFileException ex) {
-            // Lock deleted while we are setting last modified time.
-            // Ignore error and lets the app exits
-        } catch (Exception ex) {
-            System.err.println("LingeredApp ERROR: " + ex);
-            // Leave exit_code = 1 to Java launcher
-            System.exit(3);
-        }
-
-        System.exit(0);
-    }
-}
diff --git a/jdk/test/lib/jdk/test/lib/apps/LingeredAppWithDeadlock.java b/jdk/test/lib/jdk/test/lib/apps/LingeredAppWithDeadlock.java
deleted file mode 100644
index 2b52c1523db..00000000000
--- a/jdk/test/lib/jdk/test/lib/apps/LingeredAppWithDeadlock.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2005, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package jdk.test.lib.apps;
-
-import java.util.concurrent.Phaser;
-
-public class LingeredAppWithDeadlock extends LingeredApp {
-
-    private static final Object Lock1 = new Object();
-    private static final Object Lock2 = new Object();
-
-    private static volatile int reachCount = 0;
-
-    private static final Phaser p = new Phaser(2);
-
-    private static class ThreadOne extends Thread {
-        public void run() {
-            // wait Lock2 is locked
-            p.arriveAndAwaitAdvance();
-            synchronized (Lock1) {
-                // signal Lock1 is locked
-                p.arriveAndAwaitAdvance();
-                synchronized (Lock2) {
-                    reachCount += 1;
-                }
-            }
-        }
-    }
-
-    private static class ThreadTwo extends Thread {
-        public void run() {
-            synchronized (Lock2) {
-                // signal Lock2 is locked
-                p.arriveAndAwaitAdvance();
-                // wait Lock1 is locked
-                p.arriveAndAwaitAdvance();
-                synchronized (Lock1) {
-                    reachCount += 1;
-                }
-            }
-        }
-    }
-
-    public static void main(String args[]) {
-        if (args.length != 1) {
-            System.err.println("Lock file name is not specified");
-            System.exit(7);
-        }
-
-        // Run two theads that should come to deadlock
-        new ThreadOne().start();
-        new ThreadTwo().start();
-
-        if (reachCount > 0) {
-            // Not able to deadlock, exiting
-            System.exit(3);
-        }
-
-        LingeredApp.main(args);
-    }
- }
diff --git a/jdk/test/lib/jdk/test/lib/compiler/CompilerUtils.java b/jdk/test/lib/jdk/test/lib/compiler/CompilerUtils.java
deleted file mode 100644
index 138ad84da41..00000000000
--- a/jdk/test/lib/jdk/test/lib/compiler/CompilerUtils.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2015, 2018, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.test.lib.compiler;
-
-import javax.tools.JavaCompiler;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.StandardLocation;
-import javax.tools.ToolProvider;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * This class consists exclusively of static utility methods for invoking the
- * java compiler.
- */
-public final class CompilerUtils {
-    private CompilerUtils() { }
-
-    /**
-     * Compile all the java sources in {@code <source>/**} to
-     * {@code <destination>/**}. The destination directory will be created if
-     * it doesn't exist.
-     *
-     * Equivalent to calling {@code compile(source, destination, true, options);}.
-     *
-     * All warnings/errors emitted by the compiler are output to System.out/err.
-     *
-     * @param source Path to the source directory
-     * @param destination Path to the destination directory
-     * @param options Any options to pass to the compiler
-     *
-     * @return true if the compilation is successful
-     *
-     * @throws IOException
-     *         if there is an I/O error scanning the source tree or
-     *         creating the destination directory
-     * @throws UnsupportedOperationException
-     *         if there is no system java compiler
-     */
-    public static boolean compile(Path source, Path destination, String... options)
-        throws IOException
-    {
-        return compile(source, destination, true, options);
-    }
-
-    /**
-     * Compile all the java sources in {@code <source>} and optionally its
-     * subdirectories, to
-     * {@code <destination>}. The destination directory will be created if
-     * it doesn't exist.
-     *
-     * All warnings/errors emitted by the compiler are output to System.out/err.
-     *
-     * @param source Path to the source directory
-     * @param destination Path to the destination directory
-     * @param recurse If {@code true} recurse into any {@code source} subdirectories
-     *        to compile all java source files; else only compile those directly in
-     *        {@code source}.
-     * @param options Any options to pass to the compiler
-     *
-     * @return true if the compilation is successful
-     *
-     * @throws IOException
-     *         if there is an I/O error scanning the source tree or
-     *         creating the destination directory
-     * @throws UnsupportedOperationException
-     *         if there is no system java compiler
-     */
-
-   public static boolean compile(Path source, Path destination, boolean recurse, String... options)
-        throws IOException
-    {
-        JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
-        if (compiler == null) {
-            // no compiler available
-            throw new UnsupportedOperationException("Unable to get system java compiler. "
-                    + "Perhaps, jdk.compiler module is not available.");
-        }
-        StandardJavaFileManager jfm = compiler.getStandardFileManager(null, null, null);
-
-        List<Path> sources
-            = Files.find(source, (recurse ? Integer.MAX_VALUE : 1),
-                (file, attrs) -> (file.toString().endsWith(".java")))
-                .collect(Collectors.toList());
-
-        Files.createDirectories(destination);
-        jfm.setLocation(StandardLocation.CLASS_PATH, Collections.emptyList());
-        jfm.setLocationFromPaths(StandardLocation.CLASS_OUTPUT,
-                Collections.singletonList(destination));
-
-        List<String> opts = Arrays.asList(options);
-        JavaCompiler.CompilationTask task
-            = compiler.getTask(null, jfm, null, opts, null,
-                jfm.getJavaFileObjectsFromPaths(sources));
-
-        return task.call();
-    }
-}
diff --git a/jdk/test/lib/jdk/test/lib/compiler/InMemoryJavaCompiler.java b/jdk/test/lib/jdk/test/lib/compiler/InMemoryJavaCompiler.java
deleted file mode 100644
index 9444e4cc97b..00000000000
--- a/jdk/test/lib/jdk/test/lib/compiler/InMemoryJavaCompiler.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2013, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.test.lib.compiler;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.tools.ForwardingJavaFileManager;
-import javax.tools.FileObject;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaCompiler.CompilationTask;
-import javax.tools.JavaFileObject;
-import javax.tools.JavaFileObject.Kind;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.StandardLocation;
-import javax.tools.ToolProvider;
-
-/**
- * {@code InMemoryJavaCompiler} can be used for compiling a {@link
- * CharSequence} to a {@code byte[]}.
- *
- * The compiler will not use the file system at all, instead using a {@link
- * ByteArrayOutputStream} for storing the byte code. For the source code, any
- * kind of {@link CharSequence} can be used, e.g. {@link String}, {@link
- * StringBuffer} or {@link StringBuilder}.
- *
- * The {@code InMemoryCompiler} can easily be used together with a {@code
- * ByteClassLoader} to easily compile and load source code in a {@link String}:
- *
- * <pre>
- * {@code
- * import jdk.test.lib.compiler.InMemoryJavaCompiler;
- * import jdk.test.lib.ByteClassLoader;
- *
- * class Example {
- *     public static void main(String[] args) {
- *         String className = "Foo";
- *         String sourceCode = "public class " + className + " {" +
- *                             "    public void bar() {" +
- *                             "        System.out.println("Hello from bar!");" +
- *                             "    }" +
- *                             "}";
- *         byte[] byteCode = InMemoryJavaCompiler.compile(className, sourceCode);
- *         Class fooClass = ByteClassLoader.load(className, byteCode);
- *     }
- * }
- * }
- * </pre>
- */
-public class InMemoryJavaCompiler {
-    private static class MemoryJavaFileObject extends SimpleJavaFileObject {
-        private final String className;
-        private final CharSequence sourceCode;
-        private final ByteArrayOutputStream byteCode;
-
-        public MemoryJavaFileObject(String className, CharSequence sourceCode) {
-            super(URI.create("string:///" + className.replace('.','/') + Kind.SOURCE.extension), Kind.SOURCE);
-            this.className = className;
-            this.sourceCode = sourceCode;
-            this.byteCode = new ByteArrayOutputStream();
-        }
-
-        @Override
-        public CharSequence getCharContent(boolean ignoreEncodingErrors) {
-            return sourceCode;
-        }
-
-        @Override
-        public OutputStream openOutputStream() throws IOException {
-            return byteCode;
-        }
-
-        public byte[] getByteCode() {
-            return byteCode.toByteArray();
-        }
-
-        public String getClassName() {
-            return className;
-        }
-    }
-
-    private static class FileManagerWrapper extends ForwardingJavaFileManager {
-        private static final Location PATCH_LOCATION = new Location() {
-            @Override
-            public String getName() {
-                return "patch module location";
-            }
-
-            @Override
-            public boolean isOutputLocation() {
-                return false;
-            }
-        };
-        private final MemoryJavaFileObject file;
-        private final String moduleOverride;
-
-        public FileManagerWrapper(MemoryJavaFileObject file, String moduleOverride) {
-            super(getCompiler().getStandardFileManager(null, null, null));
-            this.file = file;
-            this.moduleOverride = moduleOverride;
-        }
-
-        @Override
-        public JavaFileObject getJavaFileForOutput(Location location, String className,
-                                                   Kind kind, FileObject sibling)
-            throws IOException {
-            if (!file.getClassName().equals(className)) {
-                throw new IOException("Expected class with name " + file.getClassName() +
-                                      ", but got " + className);
-            }
-            return file;
-        }
-
-        @Override
-        public Location getLocationForModule(Location location, JavaFileObject fo) throws IOException {
-            if (fo == file && moduleOverride != null) {
-                return PATCH_LOCATION;
-            }
-            return super.getLocationForModule(location, fo);
-        }
-
-        @Override
-        public String inferModuleName(Location location) throws IOException {
-            if (location == PATCH_LOCATION) {
-                return moduleOverride;
-            }
-            return super.inferModuleName(location);
-        }
-
-        @Override
-        public boolean hasLocation(Location location) {
-            return super.hasLocation(location) || location == StandardLocation.PATCH_MODULE_PATH;
-        }
-
-    }
-
-    /**
-     * Compiles the class with the given name and source code.
-     *
-     * @param className The name of the class
-     * @param sourceCode The source code for the class with name {@code className}
-     * @param options additional command line options
-     * @throws RuntimeException if the compilation did not succeed
-     * @return The resulting byte code from the compilation
-     */
-    public static byte[] compile(String className, CharSequence sourceCode, String... options) {
-        MemoryJavaFileObject file = new MemoryJavaFileObject(className, sourceCode);
-        CompilationTask task = getCompilationTask(file, options);
-
-        if(!task.call()) {
-            throw new RuntimeException("Could not compile " + className + " with source code " + sourceCode);
-        }
-
-        return file.getByteCode();
-    }
-
-    private static JavaCompiler getCompiler() {
-        return ToolProvider.getSystemJavaCompiler();
-    }
-
-    private static CompilationTask getCompilationTask(MemoryJavaFileObject file, String... options) {
-        List<String> opts = new ArrayList<>();
-        String moduleOverride = null;
-        for (String opt : options) {
-            if (opt.startsWith("--patch-module=")) {
-                moduleOverride = opt.substring("--patch-module=".length());
-            } else {
-                opts.add(opt);
-            }
-        }
-        return getCompiler().getTask(null, new FileManagerWrapper(file, moduleOverride), null, opts, null, Arrays.asList(file));
-    }
-}
diff --git a/jdk/test/lib/jdk/test/lib/compiler/ModuleInfoMaker.java b/jdk/test/lib/jdk/test/lib/compiler/ModuleInfoMaker.java
deleted file mode 100644
index f6438a678ca..00000000000
--- a/jdk/test/lib/jdk/test/lib/compiler/ModuleInfoMaker.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.test.lib.compiler;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
-
-/**
- * Utility class for creating test modules.
- */
-public class ModuleInfoMaker {
-    private static final String MODULE_INFO_JAVA = "module-info.java";
-    private static final Pattern MODULE_PATTERN =
-        Pattern.compile("module\\s+((?:\\w+\\.)*)");
-    private static final Pattern PACKAGE_PATTERN =
-                       Pattern.compile("package\\s+(((?:\\w+\\.)*)(?:\\w+))");
-    private static final Pattern CLASS_PATTERN =
-          Pattern.compile("(?:public\\s+)?(?:class|enum|interface)\\s+(\\w+)");
-
-    private final Path dir;
-
-    public ModuleInfoMaker(Path dir) {
-        this.dir = dir;
-    }
-
-    /**
-     * Create java source files of the given module
-     */
-    public void writeJavaFiles(String module, String moduleInfoJava, String... contents)
-        throws IOException
-    {
-        Path msrc = dir.resolve(module);
-        new JavaSource(moduleInfoJava).write(msrc);
-        for (String c : contents) {
-            new JavaSource(c).write(msrc);
-        }
-    }
-
-    /**
-     * Compile the module to the given destination.
-     */
-    public void compile(String module, Path dest, String... options)
-        throws IOException
-    {
-        Path msrc = dir.resolve(module);
-        String[] args =
-            Stream.concat(Arrays.stream(options),
-                          Stream.of("--module-source-path",
-                                    dir.toString())).toArray(String[]::new);
-        if (!CompilerUtils.compile(msrc, dest, args)) {
-            throw new Error("Fail to compile " + module);
-        }
-    }
-
-    static class JavaSource {
-        final String source;
-        JavaSource(String source) {
-            this.source = source;
-        }
-
-        /**
-         * Writes the source code to a file in a specified directory.
-         * @param dir the directory
-         * @throws IOException if there is a problem writing the file
-         */
-        public void write(Path dir) throws IOException {
-            Path file = dir.resolve(getJavaFileNameFromSource(source));
-            Files.createDirectories(file.getParent());
-            try (BufferedWriter out = Files.newBufferedWriter(file)) {
-                out.write(source.replace("\n", System.lineSeparator()));
-            }
-        }
-
-        /**
-         * Extracts the Java file name from the class declaration.
-         * This method is intended for simple files and uses regular expressions,
-         * so comments matching the pattern can make the method fail.
-         */
-        static String getJavaFileNameFromSource(String source) {
-            String packageName = null;
-
-            Matcher matcher = MODULE_PATTERN.matcher(source);
-            if (matcher.find())
-                return MODULE_INFO_JAVA;
-
-            matcher = PACKAGE_PATTERN.matcher(source);
-            if (matcher.find())
-                packageName = matcher.group(1).replace(".", "/");
-
-            matcher = CLASS_PATTERN.matcher(source);
-            if (matcher.find()) {
-                String className = matcher.group(1) + ".java";
-                return (packageName == null) ? className : packageName + "/" + className;
-            } else if (packageName != null) {
-                return packageName + "/package-info.java";
-            } else {
-                throw new Error("Could not extract the java class " +
-                    "name from the provided source");
-            }
-        }
-    }
-}
diff --git a/jdk/test/lib/jdk/test/lib/util/JarUtils.java b/jdk/test/lib/jdk/test/lib/util/JarUtils.java
deleted file mode 100644
index bc752d96a91..00000000000
--- a/jdk/test/lib/jdk/test/lib/util/JarUtils.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright (c) 2015, 2017, 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package jdk.test.lib.util;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-
-/**
- * Common library for various test jar file utility functions.
- */
-public final class JarUtils {
-
-    /**
-     * Create jar file with specified files. If a specified file does not exist,
-     * a new jar entry will be created with the file name itself as the content.
-     */
-    public static void createJar(String dest, String... files)
-            throws IOException {
-        try (JarOutputStream jos = new JarOutputStream(
-                new FileOutputStream(dest), new Manifest())) {
-            for (String file : files) {
-                System.out.println(String.format("Adding %s to %s",
-                        file, dest));
-
-                // add an archive entry, and write a file
-                jos.putNextEntry(new JarEntry(file));
-                try (FileInputStream fis = new FileInputStream(file)) {
-                    fis.transferTo(jos);
-                } catch (FileNotFoundException e) {
-                    jos.write(file.getBytes());
-                }
-            }
-        }
-        System.out.println();
-    }
-
-    /**
-     * Add or remove specified files to existing jar file. If a specified file
-     * to be updated or added does not exist, the jar entry will be created
-     * with the file name itself as the content.
-     *
-     * @param src the original jar file name
-     * @param dest the new jar file name
-     * @param files the files to update. The list is broken into 2 groups
-     *              by a "-" string. The files before in the 1st group will
-     *              be either updated or added. The files in the 2nd group
-     *              will be removed. If no "-" exists, all files belong to
-     *              the 1st group.
-     */
-    public static void updateJar(String src, String dest, String... files)
-            throws IOException {
-        Map<String,Object> changes = new HashMap<>();
-        boolean update = true;
-        for (String file : files) {
-            if (file.equals("-")) {
-                update = false;
-            } else if (update) {
-                try {
-                    Path p = Paths.get(file);
-                    if (Files.exists(p)) {
-                        changes.put(file, p);
-                    } else {
-                        changes.put(file, file);
-                    }
-                } catch (InvalidPathException e) {
-                    // Fallback if file not a valid Path.
-                    changes.put(file, file);
-                }
-            } else {
-                changes.put(file, Boolean.FALSE);
-            }
-        }
-        updateJar(src, dest, changes);
-    }
-
-    /**
-     * Update content of a jar file.
-     *
-     * @param src the original jar file name
-     * @param dest the new jar file name
-     * @param changes a map of changes, key is jar entry name, value is content.
-     *                Value can be Path, byte[] or String. If key exists in
-     *                src but value is Boolean FALSE. The entry is removed.
-     *                Existing entries in src not a key is unmodified.
-     * @throws IOException
-     */
-    public static void updateJar(String src, String dest,
-                                 Map<String,Object> changes)
-            throws IOException {
-
-        // What if input changes is immutable?
-        changes = new HashMap<>(changes);
-
-        System.out.printf("Creating %s from %s...\n", dest, src);
-        try (JarOutputStream jos = new JarOutputStream(
-                new FileOutputStream(dest))) {
-
-            try (JarFile srcJarFile = new JarFile(src)) {
-                Enumeration<JarEntry> entries = srcJarFile.entries();
-                while (entries.hasMoreElements()) {
-                    JarEntry entry = entries.nextElement();
-                    String name = entry.getName();
-                    if (changes.containsKey(name)) {
-                        System.out.println(String.format("- Update %s", name));
-                        updateEntry(jos, name, changes.get(name));
-                        changes.remove(name);
-                    } else {
-                        System.out.println(String.format("- Copy %s", name));
-                        jos.putNextEntry(entry);
-                        srcJarFile.getInputStream(entry).transferTo(jos);
-                    }
-                }
-            }
-            for (Map.Entry<String, Object> e : changes.entrySet()) {
-                System.out.println(String.format("- Add %s", e.getKey()));
-                updateEntry(jos, e.getKey(), e.getValue());
-            }
-        }
-        System.out.println();
-    }
-
-    private static void updateEntry(JarOutputStream jos, String name, Object content)
-           throws IOException {
-        if (content instanceof Boolean) {
-            if (((Boolean) content).booleanValue()) {
-                throw new RuntimeException("Boolean value must be FALSE");
-            }
-        } else {
-            jos.putNextEntry(new JarEntry(name));
-            if (content instanceof Path) {
-                Files.newInputStream((Path) content).transferTo(jos);
-            } else if (content instanceof byte[]) {
-                jos.write((byte[]) content);
-            } else if (content instanceof String) {
-                jos.write(((String) content).getBytes());
-            } else {
-                throw new RuntimeException("Unknown type " + content.getClass());
-            }
-        }
-    }
-}
diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
index afad9cee62c..4007227c862 100644
--- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
+++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java
@@ -30,7 +30,7 @@
  * @test
  * @bug 6216082
  * @summary  Redirect problem with HttpsURLConnection using a proxy
- * @library .. /lib
+ * @library .. /test/lib
  * @build jdk.test.lib.NetworkConfiguration
  *        jdk.test.lib.Platform
  *        HttpCallback TestHttpsServer ClosedChannelList
diff --git a/jdk/test/sun/security/ec/SignedObjectChain.java b/jdk/test/sun/security/ec/SignedObjectChain.java
index 7e2610a512a..38e2d56c0ab 100644
--- a/jdk/test/sun/security/ec/SignedObjectChain.java
+++ b/jdk/test/sun/security/ec/SignedObjectChain.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8050374 8146293
  * @summary Verify a chain of signed objects
- * @library /lib
+ * @library /test/lib
  * @compile ../../../java/security/SignedObject/Chain.java
  * @run main SignedObjectChain
  */
diff --git a/jdk/test/sun/security/mscapi/SignedObjectChain.java b/jdk/test/sun/security/mscapi/SignedObjectChain.java
index 931a0b30841..e6a5d848705 100644
--- a/jdk/test/sun/security/mscapi/SignedObjectChain.java
+++ b/jdk/test/sun/security/mscapi/SignedObjectChain.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8050374 8146293
  * @summary Verify a chain of signed objects
- * @library /lib
+ * @library /test/lib
  * @compile ../../../java/security/SignedObject/Chain.java
  * @run main SignedObjectChain
  */
diff --git a/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java b/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
index 717590f62ae..51358b43228 100644
--- a/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
+++ b/jdk/test/sun/security/pkcs11/sslecc/ClientJSSEServerJSSE.java
@@ -31,7 +31,7 @@
  * @bug 6405536
  * @summary Verify that all ciphersuites work (incl. ECC using NSS crypto)
  * @author Andreas Sterbenz
- * @library /lib .. ../../../../javax/net/ssl/TLSCommon
+ * @library /test/lib .. ../../../../javax/net/ssl/TLSCommon
  * @library ../../../../java/security/testlibrary
  * @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1"
  *      ClientJSSEServerJSSE
diff --git a/jdk/test/sun/security/pkcs12/EmptyPassword.java b/jdk/test/sun/security/pkcs12/EmptyPassword.java
index 4a24b06d97b..23d3d22f4dd 100644
--- a/jdk/test/sun/security/pkcs12/EmptyPassword.java
+++ b/jdk/test/sun/security/pkcs12/EmptyPassword.java
@@ -26,7 +26,7 @@
  * @bug 8202299
  * @modules java.base/sun.security.tools.keytool
  *          java.base/sun.security.x509
- * @library /lib /
+ * @library /test/lib /
  * @summary Java Keystore fails to load PKCS12/PFX certificates created in WindowsServer2016
  */
 
diff --git a/jdk/test/sun/security/pkcs12/ParamsPreferences.java b/jdk/test/sun/security/pkcs12/ParamsPreferences.java
index 8a1cf73cbb7..b08825e6167 100644
--- a/jdk/test/sun/security/pkcs12/ParamsPreferences.java
+++ b/jdk/test/sun/security/pkcs12/ParamsPreferences.java
@@ -38,7 +38,7 @@
 /*
  * @test
  * @bug 8076190
- * @library /lib/testlibrary /lib
+ * @library /lib/testlibrary /test/lib
  * @modules java.base/sun.security.pkcs
  *          java.base/sun.security.x509
  *          java.base/sun.security.util
diff --git a/jdk/test/sun/security/pkcs12/ParamsTest.java b/jdk/test/sun/security/pkcs12/ParamsTest.java
index 62f434e3d39..6c2ca7bffc2 100644
--- a/jdk/test/sun/security/pkcs12/ParamsTest.java
+++ b/jdk/test/sun/security/pkcs12/ParamsTest.java
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 8076190
- * @library /lib/testlibrary /lib
+ * @library /lib/testlibrary /test/lib
  * @modules java.base/sun.security.pkcs
  *          java.base/sun.security.x509
  *          java.base/sun.security.util
diff --git a/jdk/test/sun/security/rsa/SignatureTest.java b/jdk/test/sun/security/rsa/SignatureTest.java
index 0752bd084b4..7b60384018c 100644
--- a/jdk/test/sun/security/rsa/SignatureTest.java
+++ b/jdk/test/sun/security/rsa/SignatureTest.java
@@ -38,7 +38,7 @@
  * @summary Create a signature for RSA and get its signed data. re-initiate
  *          the signature with the public key. The signature can be verified
  *          by acquired signed data.
- * @library /lib
+ * @library /test/lib
  * @key randomness
  * @library ../../../lib/testlibrary
  * @run main SignatureTest MD2withRSA 512
diff --git a/jdk/test/sun/security/rsa/SignedObjectChain.java b/jdk/test/sun/security/rsa/SignedObjectChain.java
index fea6028d92e..d1923730dac 100644
--- a/jdk/test/sun/security/rsa/SignedObjectChain.java
+++ b/jdk/test/sun/security/rsa/SignedObjectChain.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8050374 8146293
  * @summary Verify a chain of signed objects
- * @library /lib
+ * @library /test/lib
  * @compile ../../../java/security/SignedObject/Chain.java
  * @run main SignedObjectChain
  */
diff --git a/jdk/test/sun/security/rsa/TestKeyPairGenerator.java b/jdk/test/sun/security/rsa/TestKeyPairGenerator.java
index 5039ed98060..4a64554045d 100644
--- a/jdk/test/sun/security/rsa/TestKeyPairGenerator.java
+++ b/jdk/test/sun/security/rsa/TestKeyPairGenerator.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 4853305 4865198 4888410 4963723 8146293
  * @summary Verify that the RSA KeyPairGenerator works
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.SigTestUtil
  * @run main TestKeyPairGenerator
  * @author Andreas Sterbenz
diff --git a/jdk/test/sun/security/rsa/TestSignatures.java b/jdk/test/sun/security/rsa/TestSignatures.java
index 1cda2929781..68dfd1adf05 100644
--- a/jdk/test/sun/security/rsa/TestSignatures.java
+++ b/jdk/test/sun/security/rsa/TestSignatures.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 4853305 4963723 8146293
  * @summary Test signing/verifying using all the signature algorithms
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.SigTestUtil
  * @run main TestSignatures
  * @author Andreas Sterbenz
diff --git a/jdk/test/sun/security/rsa/pss/SignatureTestPSS.java b/jdk/test/sun/security/rsa/pss/SignatureTestPSS.java
index b92cd925aa5..daa0fc51d8a 100644
--- a/jdk/test/sun/security/rsa/pss/SignatureTestPSS.java
+++ b/jdk/test/sun/security/rsa/pss/SignatureTestPSS.java
@@ -36,7 +36,7 @@
  * @summary Create a signature for RSASSA-PSS and get its signed data.
  *          re-initiate the signature with the public key. The signature
  *          can be verified by acquired signed data.
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.SigTestUtil
  * @run main SignatureTestPSS 512
  * @run main SignatureTestPSS 768
diff --git a/jdk/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java b/jdk/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java
index 50bbb87868f..b9fb72b8faf 100644
--- a/jdk/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java
+++ b/jdk/test/sun/security/ssl/CertPathRestrictions/TLSRestrictions.java
@@ -54,7 +54,7 @@
  * @test
  * @bug 8165367
  * @summary Verify the restrictions for certificate path on JSSE with custom trust store.
- * @library /lib
+ * @library /test/lib
  * @build jdk.test.lib.Utils
  *        jdk.test.lib.Asserts
  *        jdk.test.lib.JDKToolFinder
diff --git a/jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java b/jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java
index 70a6f5ba831..378f97cd7a0 100644
--- a/jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java
+++ b/jdk/test/sun/security/ssl/EngineArgs/DebugReportsOneExtraByte.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 7126889
  * @summary Incorrect SSLEngine debug output
- * @library /lib /lib/security
+ * @library /test/lib /lib/security
  * @run main DebugReportsOneExtraByte
  */
 /*
diff --git a/jdk/test/sun/security/ssl/rsa/SignedObjectChain.java b/jdk/test/sun/security/ssl/rsa/SignedObjectChain.java
index 1d5b21baa56..46957d83d43 100644
--- a/jdk/test/sun/security/ssl/rsa/SignedObjectChain.java
+++ b/jdk/test/sun/security/ssl/rsa/SignedObjectChain.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8050374 8146293
  * @summary Verify a chain of signed objects
- * @library /lib
+ * @library /test/lib
  * @compile ../../../../java/security/SignedObject/Chain.java
  * @run main SignedObjectChain
  */
diff --git a/jdk/test/sun/security/util/DerInputBuffer/PaddedBitString.java b/jdk/test/sun/security/util/DerInputBuffer/PaddedBitString.java
index b9a72957114..7a5719c18ac 100644
--- a/jdk/test/sun/security/util/DerInputBuffer/PaddedBitString.java
+++ b/jdk/test/sun/security/util/DerInputBuffer/PaddedBitString.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 4511556
  * @summary Verify BitString value containing padding bits is accepted.
- * @library /lib
+ * @library /test/lib
  */
 import java.io.*;
 import java.math.BigInteger;
diff --git a/jdk/test/lib/ClassFileInstaller.java b/test/lib/ClassFileInstaller.java
similarity index 100%
rename from jdk/test/lib/ClassFileInstaller.java
rename to test/lib/ClassFileInstaller.java
diff --git a/jdk/test/lib/jdk/test/lib/Asserts.java b/test/lib/jdk/test/lib/Asserts.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/Asserts.java
rename to test/lib/jdk/test/lib/Asserts.java
diff --git a/jdk/test/lib/jdk/test/lib/BuildHelper.java b/test/lib/jdk/test/lib/BuildHelper.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/BuildHelper.java
rename to test/lib/jdk/test/lib/BuildHelper.java
diff --git a/jdk/test/lib/jdk/test/lib/ByteCodeLoader.java b/test/lib/jdk/test/lib/ByteCodeLoader.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/ByteCodeLoader.java
rename to test/lib/jdk/test/lib/ByteCodeLoader.java
diff --git a/jdk/test/lib/jdk/test/lib/Container.java b/test/lib/jdk/test/lib/Container.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/Container.java
rename to test/lib/jdk/test/lib/Container.java
diff --git a/jdk/test/lib/jdk/test/lib/Convert.java b/test/lib/jdk/test/lib/Convert.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/Convert.java
rename to test/lib/jdk/test/lib/Convert.java
diff --git a/jdk/test/lib/jdk/test/lib/FileInstaller.java b/test/lib/jdk/test/lib/FileInstaller.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/FileInstaller.java
rename to test/lib/jdk/test/lib/FileInstaller.java
diff --git a/jdk/test/lib/jdk/test/lib/InfiniteLoop.java b/test/lib/jdk/test/lib/InfiniteLoop.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/InfiniteLoop.java
rename to test/lib/jdk/test/lib/InfiniteLoop.java
diff --git a/jdk/test/lib/jdk/test/lib/JDKToolFinder.java b/test/lib/jdk/test/lib/JDKToolFinder.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/JDKToolFinder.java
rename to test/lib/jdk/test/lib/JDKToolFinder.java
diff --git a/jdk/test/lib/jdk/test/lib/JDKToolLauncher.java b/test/lib/jdk/test/lib/JDKToolLauncher.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/JDKToolLauncher.java
rename to test/lib/jdk/test/lib/JDKToolLauncher.java
diff --git a/jdk/test/lib/jdk/test/lib/LockFreeLogger.java b/test/lib/jdk/test/lib/LockFreeLogger.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/LockFreeLogger.java
rename to test/lib/jdk/test/lib/LockFreeLogger.java
diff --git a/jdk/test/lib/jdk/test/lib/NetworkConfiguration.java b/test/lib/jdk/test/lib/NetworkConfiguration.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/NetworkConfiguration.java
rename to test/lib/jdk/test/lib/NetworkConfiguration.java
diff --git a/jdk/test/lib/jdk/test/lib/Platform.java b/test/lib/jdk/test/lib/Platform.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/Platform.java
rename to test/lib/jdk/test/lib/Platform.java
diff --git a/jdk/test/lib/jdk/test/lib/RandomFactory.java b/test/lib/jdk/test/lib/RandomFactory.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/RandomFactory.java
rename to test/lib/jdk/test/lib/RandomFactory.java
diff --git a/jdk/test/lib/jdk/test/lib/SigTestUtil.java b/test/lib/jdk/test/lib/SigTestUtil.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/SigTestUtil.java
rename to test/lib/jdk/test/lib/SigTestUtil.java
diff --git a/jdk/test/lib/jdk/test/lib/TimeLimitedRunner.java b/test/lib/jdk/test/lib/TimeLimitedRunner.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/TimeLimitedRunner.java
rename to test/lib/jdk/test/lib/TimeLimitedRunner.java
diff --git a/jdk/test/lib/jdk/test/lib/Utils.java b/test/lib/jdk/test/lib/Utils.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/Utils.java
rename to test/lib/jdk/test/lib/Utils.java
diff --git a/jdk/test/lib/jdk/test/lib/artifacts/Artifact.java b/test/lib/jdk/test/lib/artifacts/Artifact.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/artifacts/Artifact.java
rename to test/lib/jdk/test/lib/artifacts/Artifact.java
diff --git a/jdk/test/lib/jdk/test/lib/artifacts/ArtifactContainer.java b/test/lib/jdk/test/lib/artifacts/ArtifactContainer.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/artifacts/ArtifactContainer.java
rename to test/lib/jdk/test/lib/artifacts/ArtifactContainer.java
diff --git a/jdk/test/lib/jdk/test/lib/artifacts/ArtifactManager.java b/test/lib/jdk/test/lib/artifacts/ArtifactManager.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/artifacts/ArtifactManager.java
rename to test/lib/jdk/test/lib/artifacts/ArtifactManager.java
diff --git a/jdk/test/lib/jdk/test/lib/artifacts/ArtifactResolver.java b/test/lib/jdk/test/lib/artifacts/ArtifactResolver.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/artifacts/ArtifactResolver.java
rename to test/lib/jdk/test/lib/artifacts/ArtifactResolver.java
diff --git a/jdk/test/lib/jdk/test/lib/artifacts/ArtifactResolverException.java b/test/lib/jdk/test/lib/artifacts/ArtifactResolverException.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/artifacts/ArtifactResolverException.java
rename to test/lib/jdk/test/lib/artifacts/ArtifactResolverException.java
diff --git a/jdk/test/lib/jdk/test/lib/artifacts/DefaultArtifactManager.java b/test/lib/jdk/test/lib/artifacts/DefaultArtifactManager.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/artifacts/DefaultArtifactManager.java
rename to test/lib/jdk/test/lib/artifacts/DefaultArtifactManager.java
diff --git a/jdk/test/lib/jdk/test/lib/artifacts/JibArtifactManager.java b/test/lib/jdk/test/lib/artifacts/JibArtifactManager.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/artifacts/JibArtifactManager.java
rename to test/lib/jdk/test/lib/artifacts/JibArtifactManager.java
diff --git a/jdk/test/lib/jdk/test/lib/cds/CDSOptions.java b/test/lib/jdk/test/lib/cds/CDSOptions.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/cds/CDSOptions.java
rename to test/lib/jdk/test/lib/cds/CDSOptions.java
diff --git a/jdk/test/lib/jdk/test/lib/cds/CDSTestUtils.java b/test/lib/jdk/test/lib/cds/CDSTestUtils.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/cds/CDSTestUtils.java
rename to test/lib/jdk/test/lib/cds/CDSTestUtils.java
diff --git a/jdk/test/lib/jdk/test/lib/classloader/ClassLoadUtils.java b/test/lib/jdk/test/lib/classloader/ClassLoadUtils.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/classloader/ClassLoadUtils.java
rename to test/lib/jdk/test/lib/classloader/ClassLoadUtils.java
diff --git a/jdk/test/lib/jdk/test/lib/classloader/FilterClassLoader.java b/test/lib/jdk/test/lib/classloader/FilterClassLoader.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/classloader/FilterClassLoader.java
rename to test/lib/jdk/test/lib/classloader/FilterClassLoader.java
diff --git a/jdk/test/lib/jdk/test/lib/classloader/GeneratingClassLoader.java b/test/lib/jdk/test/lib/classloader/GeneratingClassLoader.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/classloader/GeneratingClassLoader.java
rename to test/lib/jdk/test/lib/classloader/GeneratingClassLoader.java
diff --git a/jdk/test/lib/jdk/test/lib/classloader/ParentLastURLClassLoader.java b/test/lib/jdk/test/lib/classloader/ParentLastURLClassLoader.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/classloader/ParentLastURLClassLoader.java
rename to test/lib/jdk/test/lib/classloader/ParentLastURLClassLoader.java
diff --git a/jdk/test/lib/jdk/test/lib/cli/CPUSpecificCommandLineOptionTest.java b/test/lib/jdk/test/lib/cli/CPUSpecificCommandLineOptionTest.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/cli/CPUSpecificCommandLineOptionTest.java
rename to test/lib/jdk/test/lib/cli/CPUSpecificCommandLineOptionTest.java
diff --git a/jdk/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java b/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java
rename to test/lib/jdk/test/lib/cli/CommandLineOptionTest.java
diff --git a/jdk/test/lib/jdk/test/lib/cli/predicate/AndPredicate.java b/test/lib/jdk/test/lib/cli/predicate/AndPredicate.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/cli/predicate/AndPredicate.java
rename to test/lib/jdk/test/lib/cli/predicate/AndPredicate.java
diff --git a/jdk/test/lib/jdk/test/lib/cli/predicate/CPUSpecificPredicate.java b/test/lib/jdk/test/lib/cli/predicate/CPUSpecificPredicate.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/cli/predicate/CPUSpecificPredicate.java
rename to test/lib/jdk/test/lib/cli/predicate/CPUSpecificPredicate.java
diff --git a/jdk/test/lib/jdk/test/lib/cli/predicate/NotPredicate.java b/test/lib/jdk/test/lib/cli/predicate/NotPredicate.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/cli/predicate/NotPredicate.java
rename to test/lib/jdk/test/lib/cli/predicate/NotPredicate.java
diff --git a/jdk/test/lib/jdk/test/lib/cli/predicate/OrPredicate.java b/test/lib/jdk/test/lib/cli/predicate/OrPredicate.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/cli/predicate/OrPredicate.java
rename to test/lib/jdk/test/lib/cli/predicate/OrPredicate.java
diff --git a/jdk/test/lib/jdk/test/lib/containers/cgroup/CPUSetsReader.java b/test/lib/jdk/test/lib/containers/cgroup/CPUSetsReader.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/containers/cgroup/CPUSetsReader.java
rename to test/lib/jdk/test/lib/containers/cgroup/CPUSetsReader.java
diff --git a/jdk/test/lib/jdk/test/lib/containers/cgroup/CgroupMetricsTester.java b/test/lib/jdk/test/lib/containers/cgroup/CgroupMetricsTester.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/containers/cgroup/CgroupMetricsTester.java
rename to test/lib/jdk/test/lib/containers/cgroup/CgroupMetricsTester.java
diff --git a/jdk/test/lib/jdk/test/lib/containers/cgroup/MetricsTester.java b/test/lib/jdk/test/lib/containers/cgroup/MetricsTester.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/containers/cgroup/MetricsTester.java
rename to test/lib/jdk/test/lib/containers/cgroup/MetricsTester.java
diff --git a/jdk/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV1.java b/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV1.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV1.java
rename to test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV1.java
diff --git a/jdk/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV2.java b/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV2.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV2.java
rename to test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV2.java
diff --git a/jdk/test/lib/jdk/test/lib/containers/docker/Common.java b/test/lib/jdk/test/lib/containers/docker/Common.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/containers/docker/Common.java
rename to test/lib/jdk/test/lib/containers/docker/Common.java
diff --git a/jdk/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java b/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
rename to test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
diff --git a/jdk/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
rename to test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
diff --git a/jdk/test/lib/jdk/test/lib/containers/docker/DockerfileConfig.java b/test/lib/jdk/test/lib/containers/docker/DockerfileConfig.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/containers/docker/DockerfileConfig.java
rename to test/lib/jdk/test/lib/containers/docker/DockerfileConfig.java
diff --git a/jdk/test/lib/jdk/test/lib/dcmd/CommandExecutor.java b/test/lib/jdk/test/lib/dcmd/CommandExecutor.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/dcmd/CommandExecutor.java
rename to test/lib/jdk/test/lib/dcmd/CommandExecutor.java
diff --git a/jdk/test/lib/jdk/test/lib/dcmd/CommandExecutorException.java b/test/lib/jdk/test/lib/dcmd/CommandExecutorException.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/dcmd/CommandExecutorException.java
rename to test/lib/jdk/test/lib/dcmd/CommandExecutorException.java
diff --git a/jdk/test/lib/jdk/test/lib/dcmd/FileJcmdExecutor.java b/test/lib/jdk/test/lib/dcmd/FileJcmdExecutor.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/dcmd/FileJcmdExecutor.java
rename to test/lib/jdk/test/lib/dcmd/FileJcmdExecutor.java
diff --git a/jdk/test/lib/jdk/test/lib/dcmd/JMXExecutor.java b/test/lib/jdk/test/lib/dcmd/JMXExecutor.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/dcmd/JMXExecutor.java
rename to test/lib/jdk/test/lib/dcmd/JMXExecutor.java
diff --git a/jdk/test/lib/jdk/test/lib/dcmd/JcmdExecutor.java b/test/lib/jdk/test/lib/dcmd/JcmdExecutor.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/dcmd/JcmdExecutor.java
rename to test/lib/jdk/test/lib/dcmd/JcmdExecutor.java
diff --git a/jdk/test/lib/jdk/test/lib/dcmd/MainClassJcmdExecutor.java b/test/lib/jdk/test/lib/dcmd/MainClassJcmdExecutor.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/dcmd/MainClassJcmdExecutor.java
rename to test/lib/jdk/test/lib/dcmd/MainClassJcmdExecutor.java
diff --git a/jdk/test/lib/jdk/test/lib/dcmd/PidJcmdExecutor.java b/test/lib/jdk/test/lib/dcmd/PidJcmdExecutor.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/dcmd/PidJcmdExecutor.java
rename to test/lib/jdk/test/lib/dcmd/PidJcmdExecutor.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/HprofParser.java b/test/lib/jdk/test/lib/hprof/HprofParser.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/HprofParser.java
rename to test/lib/jdk/test/lib/hprof/HprofParser.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/README b/test/lib/jdk/test/lib/hprof/README
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/README
rename to test/lib/jdk/test/lib/hprof/README
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/AbstractJavaHeapObjectVisitor.java b/test/lib/jdk/test/lib/hprof/model/AbstractJavaHeapObjectVisitor.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/AbstractJavaHeapObjectVisitor.java
rename to test/lib/jdk/test/lib/hprof/model/AbstractJavaHeapObjectVisitor.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/ArrayTypeCodes.java b/test/lib/jdk/test/lib/hprof/model/ArrayTypeCodes.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/ArrayTypeCodes.java
rename to test/lib/jdk/test/lib/hprof/model/ArrayTypeCodes.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/HackJavaValue.java b/test/lib/jdk/test/lib/hprof/model/HackJavaValue.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/HackJavaValue.java
rename to test/lib/jdk/test/lib/hprof/model/HackJavaValue.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaBoolean.java b/test/lib/jdk/test/lib/hprof/model/JavaBoolean.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaBoolean.java
rename to test/lib/jdk/test/lib/hprof/model/JavaBoolean.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaByte.java b/test/lib/jdk/test/lib/hprof/model/JavaByte.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaByte.java
rename to test/lib/jdk/test/lib/hprof/model/JavaByte.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaChar.java b/test/lib/jdk/test/lib/hprof/model/JavaChar.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaChar.java
rename to test/lib/jdk/test/lib/hprof/model/JavaChar.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaClass.java b/test/lib/jdk/test/lib/hprof/model/JavaClass.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaClass.java
rename to test/lib/jdk/test/lib/hprof/model/JavaClass.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaDouble.java b/test/lib/jdk/test/lib/hprof/model/JavaDouble.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaDouble.java
rename to test/lib/jdk/test/lib/hprof/model/JavaDouble.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaField.java b/test/lib/jdk/test/lib/hprof/model/JavaField.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaField.java
rename to test/lib/jdk/test/lib/hprof/model/JavaField.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaFloat.java b/test/lib/jdk/test/lib/hprof/model/JavaFloat.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaFloat.java
rename to test/lib/jdk/test/lib/hprof/model/JavaFloat.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaHeapObject.java b/test/lib/jdk/test/lib/hprof/model/JavaHeapObject.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaHeapObject.java
rename to test/lib/jdk/test/lib/hprof/model/JavaHeapObject.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaHeapObjectVisitor.java b/test/lib/jdk/test/lib/hprof/model/JavaHeapObjectVisitor.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaHeapObjectVisitor.java
rename to test/lib/jdk/test/lib/hprof/model/JavaHeapObjectVisitor.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaInt.java b/test/lib/jdk/test/lib/hprof/model/JavaInt.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaInt.java
rename to test/lib/jdk/test/lib/hprof/model/JavaInt.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaLazyReadObject.java b/test/lib/jdk/test/lib/hprof/model/JavaLazyReadObject.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaLazyReadObject.java
rename to test/lib/jdk/test/lib/hprof/model/JavaLazyReadObject.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaLong.java b/test/lib/jdk/test/lib/hprof/model/JavaLong.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaLong.java
rename to test/lib/jdk/test/lib/hprof/model/JavaLong.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaObject.java b/test/lib/jdk/test/lib/hprof/model/JavaObject.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaObject.java
rename to test/lib/jdk/test/lib/hprof/model/JavaObject.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaObjectArray.java b/test/lib/jdk/test/lib/hprof/model/JavaObjectArray.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaObjectArray.java
rename to test/lib/jdk/test/lib/hprof/model/JavaObjectArray.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaObjectRef.java b/test/lib/jdk/test/lib/hprof/model/JavaObjectRef.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaObjectRef.java
rename to test/lib/jdk/test/lib/hprof/model/JavaObjectRef.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaShort.java b/test/lib/jdk/test/lib/hprof/model/JavaShort.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaShort.java
rename to test/lib/jdk/test/lib/hprof/model/JavaShort.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaStatic.java b/test/lib/jdk/test/lib/hprof/model/JavaStatic.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaStatic.java
rename to test/lib/jdk/test/lib/hprof/model/JavaStatic.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaThing.java b/test/lib/jdk/test/lib/hprof/model/JavaThing.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaThing.java
rename to test/lib/jdk/test/lib/hprof/model/JavaThing.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaValue.java b/test/lib/jdk/test/lib/hprof/model/JavaValue.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaValue.java
rename to test/lib/jdk/test/lib/hprof/model/JavaValue.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/JavaValueArray.java b/test/lib/jdk/test/lib/hprof/model/JavaValueArray.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/JavaValueArray.java
rename to test/lib/jdk/test/lib/hprof/model/JavaValueArray.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/ReachableExcludes.java b/test/lib/jdk/test/lib/hprof/model/ReachableExcludes.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/ReachableExcludes.java
rename to test/lib/jdk/test/lib/hprof/model/ReachableExcludes.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/ReachableExcludesImpl.java b/test/lib/jdk/test/lib/hprof/model/ReachableExcludesImpl.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/ReachableExcludesImpl.java
rename to test/lib/jdk/test/lib/hprof/model/ReachableExcludesImpl.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/ReachableObjects.java b/test/lib/jdk/test/lib/hprof/model/ReachableObjects.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/ReachableObjects.java
rename to test/lib/jdk/test/lib/hprof/model/ReachableObjects.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/ReferenceChain.java b/test/lib/jdk/test/lib/hprof/model/ReferenceChain.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/ReferenceChain.java
rename to test/lib/jdk/test/lib/hprof/model/ReferenceChain.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/Root.java b/test/lib/jdk/test/lib/hprof/model/Root.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/Root.java
rename to test/lib/jdk/test/lib/hprof/model/Root.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/Snapshot.java b/test/lib/jdk/test/lib/hprof/model/Snapshot.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/Snapshot.java
rename to test/lib/jdk/test/lib/hprof/model/Snapshot.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/StackFrame.java b/test/lib/jdk/test/lib/hprof/model/StackFrame.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/StackFrame.java
rename to test/lib/jdk/test/lib/hprof/model/StackFrame.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/model/StackTrace.java b/test/lib/jdk/test/lib/hprof/model/StackTrace.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/model/StackTrace.java
rename to test/lib/jdk/test/lib/hprof/model/StackTrace.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/parser/FileReadBuffer.java b/test/lib/jdk/test/lib/hprof/parser/FileReadBuffer.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/parser/FileReadBuffer.java
rename to test/lib/jdk/test/lib/hprof/parser/FileReadBuffer.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/parser/HprofReader.java b/test/lib/jdk/test/lib/hprof/parser/HprofReader.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/parser/HprofReader.java
rename to test/lib/jdk/test/lib/hprof/parser/HprofReader.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/parser/MappedReadBuffer.java b/test/lib/jdk/test/lib/hprof/parser/MappedReadBuffer.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/parser/MappedReadBuffer.java
rename to test/lib/jdk/test/lib/hprof/parser/MappedReadBuffer.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/parser/PositionDataInputStream.java b/test/lib/jdk/test/lib/hprof/parser/PositionDataInputStream.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/parser/PositionDataInputStream.java
rename to test/lib/jdk/test/lib/hprof/parser/PositionDataInputStream.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/parser/PositionInputStream.java b/test/lib/jdk/test/lib/hprof/parser/PositionInputStream.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/parser/PositionInputStream.java
rename to test/lib/jdk/test/lib/hprof/parser/PositionInputStream.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/parser/ReadBuffer.java b/test/lib/jdk/test/lib/hprof/parser/ReadBuffer.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/parser/ReadBuffer.java
rename to test/lib/jdk/test/lib/hprof/parser/ReadBuffer.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/parser/Reader.java b/test/lib/jdk/test/lib/hprof/parser/Reader.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/parser/Reader.java
rename to test/lib/jdk/test/lib/hprof/parser/Reader.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/util/ArraySorter.java b/test/lib/jdk/test/lib/hprof/util/ArraySorter.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/util/ArraySorter.java
rename to test/lib/jdk/test/lib/hprof/util/ArraySorter.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/util/Comparer.java b/test/lib/jdk/test/lib/hprof/util/Comparer.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/util/Comparer.java
rename to test/lib/jdk/test/lib/hprof/util/Comparer.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/util/CompositeEnumeration.java b/test/lib/jdk/test/lib/hprof/util/CompositeEnumeration.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/util/CompositeEnumeration.java
rename to test/lib/jdk/test/lib/hprof/util/CompositeEnumeration.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/util/Misc.java b/test/lib/jdk/test/lib/hprof/util/Misc.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/util/Misc.java
rename to test/lib/jdk/test/lib/hprof/util/Misc.java
diff --git a/jdk/test/lib/jdk/test/lib/hprof/util/VectorSorter.java b/test/lib/jdk/test/lib/hprof/util/VectorSorter.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/hprof/util/VectorSorter.java
rename to test/lib/jdk/test/lib/hprof/util/VectorSorter.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/AppExecutorHelper.java b/test/lib/jdk/test/lib/jfr/AppExecutorHelper.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/AppExecutorHelper.java
rename to test/lib/jdk/test/lib/jfr/AppExecutorHelper.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/CommonHelper.java b/test/lib/jdk/test/lib/jfr/CommonHelper.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/CommonHelper.java
rename to test/lib/jdk/test/lib/jfr/CommonHelper.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/EventField.java b/test/lib/jdk/test/lib/jfr/EventField.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/EventField.java
rename to test/lib/jdk/test/lib/jfr/EventField.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/EventNames.java b/test/lib/jdk/test/lib/jfr/EventNames.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/EventNames.java
rename to test/lib/jdk/test/lib/jfr/EventNames.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/EventTypePrototype.java b/test/lib/jdk/test/lib/jfr/EventTypePrototype.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/EventTypePrototype.java
rename to test/lib/jdk/test/lib/jfr/EventTypePrototype.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/EventVerifier.java b/test/lib/jdk/test/lib/jfr/EventVerifier.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/EventVerifier.java
rename to test/lib/jdk/test/lib/jfr/EventVerifier.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/Events.java b/test/lib/jdk/test/lib/jfr/Events.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/Events.java
rename to test/lib/jdk/test/lib/jfr/Events.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/FileHelper.java b/test/lib/jdk/test/lib/jfr/FileHelper.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/FileHelper.java
rename to test/lib/jdk/test/lib/jfr/FileHelper.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/GCHelper.java b/test/lib/jdk/test/lib/jfr/GCHelper.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/GCHelper.java
rename to test/lib/jdk/test/lib/jfr/GCHelper.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/RecurseThread.java b/test/lib/jdk/test/lib/jfr/RecurseThread.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/RecurseThread.java
rename to test/lib/jdk/test/lib/jfr/RecurseThread.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/SimpleEvent.java b/test/lib/jdk/test/lib/jfr/SimpleEvent.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/SimpleEvent.java
rename to test/lib/jdk/test/lib/jfr/SimpleEvent.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/SimpleEventHelper.java b/test/lib/jdk/test/lib/jfr/SimpleEventHelper.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/SimpleEventHelper.java
rename to test/lib/jdk/test/lib/jfr/SimpleEventHelper.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/SimpleSetting.java b/test/lib/jdk/test/lib/jfr/SimpleSetting.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/SimpleSetting.java
rename to test/lib/jdk/test/lib/jfr/SimpleSetting.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/Stressor.java b/test/lib/jdk/test/lib/jfr/Stressor.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/Stressor.java
rename to test/lib/jdk/test/lib/jfr/Stressor.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/TestClassLoader.java b/test/lib/jdk/test/lib/jfr/TestClassLoader.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/TestClassLoader.java
rename to test/lib/jdk/test/lib/jfr/TestClassLoader.java
diff --git a/jdk/test/lib/jdk/test/lib/jfr/VoidFunction.java b/test/lib/jdk/test/lib/jfr/VoidFunction.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/jfr/VoidFunction.java
rename to test/lib/jdk/test/lib/jfr/VoidFunction.java
diff --git a/jdk/test/lib/jdk/test/lib/management/DynamicVMOption.java b/test/lib/jdk/test/lib/management/DynamicVMOption.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/management/DynamicVMOption.java
rename to test/lib/jdk/test/lib/management/DynamicVMOption.java
diff --git a/jdk/test/lib/jdk/test/lib/management/InputArguments.java b/test/lib/jdk/test/lib/management/InputArguments.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/management/InputArguments.java
rename to test/lib/jdk/test/lib/management/InputArguments.java
diff --git a/jdk/test/lib/jdk/test/lib/management/ThreadMXBeanTool.java b/test/lib/jdk/test/lib/management/ThreadMXBeanTool.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/management/ThreadMXBeanTool.java
rename to test/lib/jdk/test/lib/management/ThreadMXBeanTool.java
diff --git a/jdk/test/lib/jdk/test/lib/process/ExitCode.java b/test/lib/jdk/test/lib/process/ExitCode.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/process/ExitCode.java
rename to test/lib/jdk/test/lib/process/ExitCode.java
diff --git a/jdk/test/lib/jdk/test/lib/process/OutputAnalyzer.java b/test/lib/jdk/test/lib/process/OutputAnalyzer.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/process/OutputAnalyzer.java
rename to test/lib/jdk/test/lib/process/OutputAnalyzer.java
diff --git a/jdk/test/lib/jdk/test/lib/process/OutputBuffer.java b/test/lib/jdk/test/lib/process/OutputBuffer.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/process/OutputBuffer.java
rename to test/lib/jdk/test/lib/process/OutputBuffer.java
diff --git a/jdk/test/lib/jdk/test/lib/process/ProcessTools.java b/test/lib/jdk/test/lib/process/ProcessTools.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/process/ProcessTools.java
rename to test/lib/jdk/test/lib/process/ProcessTools.java
diff --git a/jdk/test/lib/jdk/test/lib/process/StreamPumper.java b/test/lib/jdk/test/lib/process/StreamPumper.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/process/StreamPumper.java
rename to test/lib/jdk/test/lib/process/StreamPumper.java
diff --git a/jdk/test/lib/jdk/test/lib/thread/TestThread.java b/test/lib/jdk/test/lib/thread/TestThread.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/thread/TestThread.java
rename to test/lib/jdk/test/lib/thread/TestThread.java
diff --git a/jdk/test/lib/jdk/test/lib/thread/XRun.java b/test/lib/jdk/test/lib/thread/XRun.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/thread/XRun.java
rename to test/lib/jdk/test/lib/thread/XRun.java
diff --git a/jdk/test/lib/jdk/test/lib/util/Pair.java b/test/lib/jdk/test/lib/util/Pair.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/util/Pair.java
rename to test/lib/jdk/test/lib/util/Pair.java
diff --git a/jdk/test/lib/jdk/test/lib/util/SerializationUtils.java b/test/lib/jdk/test/lib/util/SerializationUtils.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/util/SerializationUtils.java
rename to test/lib/jdk/test/lib/util/SerializationUtils.java
diff --git a/jdk/test/lib/jdk/test/lib/util/Triple.java b/test/lib/jdk/test/lib/util/Triple.java
similarity index 100%
rename from jdk/test/lib/jdk/test/lib/util/Triple.java
rename to test/lib/jdk/test/lib/util/Triple.java
diff --git a/jdk/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java
similarity index 100%
rename from jdk/test/lib/sun/hotspot/WhiteBox.java
rename to test/lib/sun/hotspot/WhiteBox.java
diff --git a/jdk/test/lib/sun/hotspot/code/BlobType.java b/test/lib/sun/hotspot/code/BlobType.java
similarity index 100%
rename from jdk/test/lib/sun/hotspot/code/BlobType.java
rename to test/lib/sun/hotspot/code/BlobType.java
diff --git a/jdk/test/lib/sun/hotspot/code/CodeBlob.java b/test/lib/sun/hotspot/code/CodeBlob.java
similarity index 100%
rename from jdk/test/lib/sun/hotspot/code/CodeBlob.java
rename to test/lib/sun/hotspot/code/CodeBlob.java
diff --git a/jdk/test/lib/sun/hotspot/code/Compiler.java b/test/lib/sun/hotspot/code/Compiler.java
similarity index 100%
rename from jdk/test/lib/sun/hotspot/code/Compiler.java
rename to test/lib/sun/hotspot/code/Compiler.java
diff --git a/jdk/test/lib/sun/hotspot/code/NMethod.java b/test/lib/sun/hotspot/code/NMethod.java
similarity index 100%
rename from jdk/test/lib/sun/hotspot/code/NMethod.java
rename to test/lib/sun/hotspot/code/NMethod.java
diff --git a/jdk/test/lib/sun/hotspot/cpuinfo/CPUInfo.java b/test/lib/sun/hotspot/cpuinfo/CPUInfo.java
similarity index 100%
rename from jdk/test/lib/sun/hotspot/cpuinfo/CPUInfo.java
rename to test/lib/sun/hotspot/cpuinfo/CPUInfo.java
diff --git a/jdk/test/lib/sun/hotspot/gc/GC.java b/test/lib/sun/hotspot/gc/GC.java
similarity index 100%
rename from jdk/test/lib/sun/hotspot/gc/GC.java
rename to test/lib/sun/hotspot/gc/GC.java
diff --git a/jdk/test/lib/sun/hotspot/parser/DiagnosticCommand.java b/test/lib/sun/hotspot/parser/DiagnosticCommand.java
similarity index 100%
rename from jdk/test/lib/sun/hotspot/parser/DiagnosticCommand.java
rename to test/lib/sun/hotspot/parser/DiagnosticCommand.java