diff --git a/test/serviceability/ParserTest.java b/test/serviceability/ParserTest.java
index 63ee9210e4060a412f1664bcf54284fdac094e09..8db151f4d3f239c7c305f8410b71f61ea7909a58 100644
--- a/test/serviceability/ParserTest.java
+++ b/test/serviceability/ParserTest.java
@@ -22,10 +22,10 @@
  */
 
 /*
- * @test ParserTest
+ * @test
  * @summary Test that the diagnostic command arguemnt parser works
  * @library /testlibrary /testlibrary/whitebox
- * @build ParserTest
+ * @build ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.parser.*
  * @run main ClassFileInstaller sun.hotspot.WhiteBox
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ParserTest
  */
diff --git a/test/serviceability/attach/AttachWithStalePidFile.java b/test/serviceability/attach/AttachWithStalePidFile.java
index fa74379b3a7dcad53b007421c00b954bcd0c2d7e..69dff6d98887db657a2cade82131511f1afdb5ab 100644
--- a/test/serviceability/attach/AttachWithStalePidFile.java
+++ b/test/serviceability/attach/AttachWithStalePidFile.java
@@ -27,7 +27,7 @@
  * @key regression
  * @summary Regression test for attach issue where stale pid files in /tmp lead to connection issues
  * @library /testlibrary
- * @compile AttachWithStalePidFileTarget.java
+ * @build com.oracle.java.testlibrary.* AttachWithStalePidFileTarget
  * @run main AttachWithStalePidFile
  */
 
diff --git a/test/serviceability/jvmti/GetObjectSizeOverflow.java b/test/serviceability/jvmti/GetObjectSizeOverflow.java
index ec33d8135417de8cb4c6d9f4aec58e2c0f051575..9acefe511f5d67aa34a3eeab4810b2b2b5269aeb 100644
--- a/test/serviceability/jvmti/GetObjectSizeOverflow.java
+++ b/test/serviceability/jvmti/GetObjectSizeOverflow.java
@@ -29,7 +29,7 @@ import com.oracle.java.testlibrary.*;
  * @test
  * @bug 8027230
  * @library /testlibrary
- * @build GetObjectSizeOverflowAgent
+ * @build ClassFileInstaller com.oracle.java.testlibrary.* GetObjectSizeOverflowAgent
  * @run main ClassFileInstaller GetObjectSizeOverflowAgent
  * @run main GetObjectSizeOverflow
  */
diff --git a/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java b/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java
index 4f929c49af661689a0f0e869ea108c5359f17844..14ffea90bd5e2bde3bd822acbd01a36e16fe5079 100644
--- a/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java
+++ b/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java
@@ -26,7 +26,7 @@
  * @summary Redefine a class with an UnresolvedClass reference in the constant pool.
  * @bug 8035150
  * @library /testlibrary
- * @build UnresolvedClassAgent com.oracle.java.testlibrary.ProcessTools com.oracle.java.testlibrary.OutputAnalyzer
+ * @build com.oracle.java.testlibrary.* UnresolvedClassAgent
  * @run main TestRedefineWithUnresolvedClass
  */
 
diff --git a/test/serviceability/sa/jmap-hashcode/Test8028623.java b/test/serviceability/sa/jmap-hashcode/Test8028623.java
index bd743ab1c1f99c06fb92cf9793538771742ef4a2..6f4b2fd689a0c45e75bc8a6e3534116c7b993016 100644
--- a/test/serviceability/sa/jmap-hashcode/Test8028623.java
+++ b/test/serviceability/sa/jmap-hashcode/Test8028623.java
@@ -26,6 +26,7 @@
  * @bug 8028623
  * @summary Test hashing of extended characters in Serviceability Agent.
  * @library /testlibrary
+ * @build com.oracle.java.testlibrary.*
  * @compile -encoding utf8 Test8028623.java
  * @run main Test8028623
  */
diff --git a/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java b/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
index df6ecb28f1428cf268f7bd42d1733f9bae9360b1..eeeecba0da4c0dbc7196933a0ecf6047c7f7523c 100644
--- a/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
+++ b/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java
@@ -44,7 +44,7 @@ import com.oracle.java.testlibrary.ProcessTools;
  * @key regression
  * @summary Regression test for hprof export issue due to large heaps (>2G)
  * @library /testlibrary
- * @compile JMapHProfLargeHeapProc.java
+ * @build com.oracle.java.testlibrary.* JMapHProfLargeHeapProc
  * @run main JMapHProfLargeHeapTest
  */
 
diff --git a/test/testlibrary/ctw/test/ClassesDirTest.java b/test/testlibrary/ctw/test/ClassesDirTest.java
index ae5eaf0f2e41f25b4d9a5f0b4f1661379c805e95..cc28d4034004cd518ee1f932c2b8b01f7e0e2047 100644
--- a/test/testlibrary/ctw/test/ClassesDirTest.java
+++ b/test/testlibrary/ctw/test/ClassesDirTest.java
@@ -22,10 +22,10 @@
  */
 
 /*
- * @test ClassesDirTest
+ * @test
  * @bug 8012447
  * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
- * @build sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox ClassesDirTest Foo Bar
+ * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
  * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
  * @run main ClassesDirTest prepare
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes
diff --git a/test/testlibrary/ctw/test/ClassesListTest.java b/test/testlibrary/ctw/test/ClassesListTest.java
index a98cd53a3f6a71c108e95e92a3e3820af61405a0..64c5203cf1080cd724cb1757e6c5e8d363fdeb02 100644
--- a/test/testlibrary/ctw/test/ClassesListTest.java
+++ b/test/testlibrary/ctw/test/ClassesListTest.java
@@ -22,10 +22,10 @@
  */
 
 /*
- * @test ClassesListTest
+ * @test
  * @bug 8012447
  * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
- * @build sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox ClassesListTest Foo Bar
+ * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
  * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
  * @run main ClassesListTest prepare
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld classes.lst
diff --git a/test/testlibrary/ctw/test/JarDirTest.java b/test/testlibrary/ctw/test/JarDirTest.java
index 76f682fd7559158f6bc219b9dc38e6257f3183ba..abc5a0843d2d6634027e8fb652919113334740a1 100644
--- a/test/testlibrary/ctw/test/JarDirTest.java
+++ b/test/testlibrary/ctw/test/JarDirTest.java
@@ -22,10 +22,10 @@
  */
 
 /*
- * @test JarDirTest
+ * @test
  * @bug 8012447
  * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
- * @build sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox JarDirTest Foo Bar
+ * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
  * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
  * @run main JarDirTest prepare
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld jars/*
diff --git a/test/testlibrary/ctw/test/JarsTest.java b/test/testlibrary/ctw/test/JarsTest.java
index 04792729f4e7c0de3d95afd8310d66cf9b3a3f8b..c9bfb303132e9fd66a02ae10ee2bf8513f8c59c8 100644
--- a/test/testlibrary/ctw/test/JarsTest.java
+++ b/test/testlibrary/ctw/test/JarsTest.java
@@ -22,10 +22,10 @@
  */
 
 /*
- * @test JarsTest
+ * @test
  * @bug 8012447
  * @library /testlibrary /testlibrary/whitebox /testlibrary/ctw/src
- * @build sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox JarsTest Foo Bar
+ * @build ClassFileInstaller com.oracle.java.testlibrary.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
  * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
  * @run main JarsTest prepare
  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld foo.jar bar.jar