diff --git a/test/compiler/jvmci/SecurityRestrictionsTest.java b/test/compiler/jvmci/SecurityRestrictionsTest.java
--- a/test/compiler/jvmci/SecurityRestrictionsTest.java
+++ b/test/compiler/jvmci/SecurityRestrictionsTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
  *      compiler.jvmci.SecurityRestrictionsTest
  *      NO_SEC_MAN
diff --git a/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java b/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java
--- a/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java
+++ b/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
diff --git a/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java b/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java
--- a/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java
+++ b/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
diff --git a/test/compiler/jvmci/compilerToVM/CollectCountersTest.java b/test/compiler/jvmci/compilerToVM/CollectCountersTest.java
--- a/test/compiler/jvmci/compilerToVM/CollectCountersTest.java
+++ b/test/compiler/jvmci/compilerToVM/CollectCountersTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib/
+ * @library / /testlibrary /test/lib/
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller
  *     jdk.vm.ci.hotspot.CompilerToVMHelper
diff --git a/test/compiler/jvmci/compilerToVM/DebugOutputTest.java b/test/compiler/jvmci/compilerToVM/DebugOutputTest.java
--- a/test/compiler/jvmci/compilerToVM/DebugOutputTest.java
+++ b/test/compiler/jvmci/compilerToVM/DebugOutputTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller
  *      jdk.vm.ci.hotspot.CompilerToVMHelper
diff --git a/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java b/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java
--- a/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java
+++ b/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @ignore 8139700
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
diff --git a/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java b/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java
--- a/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java
+++ b/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
diff --git a/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java b/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java
--- a/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java
+++ b/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java
@@ -21,7 +21,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  *        compiler.jvmci.compilerToVM.ExecuteInstalledCodeTest
diff --git a/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java b/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java
--- a/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java
+++ b/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.FindUniqueConcreteMethodTest
  * @run main ClassFileInstaller
diff --git a/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java b/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java
--- a/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
diff --git a/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java b/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java
--- a/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetClassInitializerTest
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
diff --git a/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java b/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java
--- a/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @ignore 8139385
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
diff --git a/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java b/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java
--- a/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
diff --git a/test/compiler/jvmci/compilerToVM/GetImplementorTest.java b/test/compiler/jvmci/compilerToVM/GetImplementorTest.java
--- a/test/compiler/jvmci/compilerToVM/GetImplementorTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetImplementorTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib/
+ * @library / /testlibrary /test/lib/
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetImplementorTest
  * @run main ClassFileInstaller
diff --git a/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java b/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java
--- a/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
diff --git a/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java b/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java
--- a/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @clean compiler.jvmci.compilerToVM.*
  * @compile -g DummyInterface.java
  * @compile -g DummyAbstractClass.java
diff --git a/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java b/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java
--- a/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib/
+ * @library / /testlibrary /test/lib/
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetMaxCallTargetOffsetTest
  * @run main ClassFileInstaller
diff --git a/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java b/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java
--- a/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller
  *      jdk.vm.ci.hotspot.CompilerToVMHelper
diff --git a/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java b/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java
--- a/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
diff --git a/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java b/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java
--- a/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetResolvedJavaMethodTest
  * @run main ClassFileInstaller
diff --git a/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java b/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java
--- a/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetResolvedJavaTypeTest
  * @run main ClassFileInstaller
diff --git a/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java b/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java
--- a/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
diff --git a/test/compiler/jvmci/compilerToVM/GetSymbolTest.java b/test/compiler/jvmci/compilerToVM/GetSymbolTest.java
--- a/test/compiler/jvmci/compilerToVM/GetSymbolTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetSymbolTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetSymbolTest
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
diff --git a/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java b/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java
--- a/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java
+++ b/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.GetVtableIndexForInterfaceTest
  * @run main ClassFileInstaller
diff --git a/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java b/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java
--- a/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java
+++ b/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
diff --git a/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java b/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java
--- a/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java
+++ b/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.HasFinalizableSubclassTest
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
diff --git a/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java b/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java
--- a/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java
+++ b/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @ignore 8139700
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
diff --git a/test/compiler/jvmci/compilerToVM/IsMatureTest.java b/test/compiler/jvmci/compilerToVM/IsMatureTest.java
--- a/test/compiler/jvmci/compilerToVM/IsMatureTest.java
+++ b/test/compiler/jvmci/compilerToVM/IsMatureTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox IsMatureTest
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
diff --git a/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java b/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java
--- a/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java
+++ b/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java
@@ -27,7 +27,7 @@
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
  * @summary Testing compiler.jvmci.CompilerToVM.lookupKlassInPool method
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.common.testcases.MultipleImplementersInterface
  *        compiler.jvmci.common.testcases.MultipleImplementer2
diff --git a/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java b/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
--- a/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
+++ b/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @ignore 8139703
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox MaterializeVirtualObjectTest
diff --git a/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java b/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java
--- a/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java
+++ b/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
  * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
diff --git a/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java b/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java
--- a/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java
+++ b/test/compiler/jvmci/compilerToVM/ReadUncompressedOopTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib/
+ * @library / /testlibrary /test/lib/
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.ReadUncompressedOopTest
  * @run main ClassFileInstaller
diff --git a/test/compiler/jvmci/compilerToVM/ReprofileTest.java b/test/compiler/jvmci/compilerToVM/ReprofileTest.java
--- a/test/compiler/jvmci/compilerToVM/ReprofileTest.java
+++ b/test/compiler/jvmci/compilerToVM/ReprofileTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller
diff --git a/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java b/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java
--- a/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java
+++ b/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.ResolveConstantInPoolTest
  * @run main ClassFileInstaller jdk.vm.ci.hotspot.CompilerToVMHelper
diff --git a/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java b/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java
--- a/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java
+++ b/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib
+ * @library / /testlibrary /test/lib
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.ResolveMethodTest
  * @run main ClassFileInstaller
diff --git a/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java b/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java
--- a/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java
+++ b/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java
@@ -27,7 +27,7 @@
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
  * @summary Testing compiler.jvmci.CompilerToVM.resolveTypeInPool method
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.common.testcases.MultipleImplementersInterface
  *        compiler.jvmci.common.testcases.MultipleImplementer2
diff --git a/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java b/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java
--- a/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java
+++ b/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java
@@ -25,7 +25,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library / /testlibrary /../../test/lib/
+ * @library / /testlibrary /test/lib/
  * @compile ../common/CompilerToVMHelper.java
  * @build compiler.jvmci.compilerToVM.ShouldDebugNonSafepointsTest
  * @run main ClassFileInstaller
diff --git a/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java b/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java
--- a/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java
+++ b/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java
@@ -26,7 +26,7 @@
  * @test
  * @bug 8136421
  * @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /testlibrary /../../test/lib /
+ * @library /testlibrary /test/lib /
  * @compile ../common/CompilerToVMHelper.java
  * @build sun.hotspot.WhiteBox
  * @run main ClassFileInstaller sun.hotspot.WhiteBox