diff --git a/jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java b/jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java
index fe07abd8f1c..cf597cc527d 100644
--- a/jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java
+++ b/jdk/test/com/sun/jdi/cds/CDSBreakpointTest.java
@@ -31,6 +31,9 @@
  *          jdk.jartool/sun.tools.jar
  * @library /lib/testlibrary
  * @library ..
+ * @build jdk.testlibrary.*
+ * @build TestScaffold VMConnection TargetListener TargetAdapter
+ * @build CDSJDITest
  * @run compile -g ../BreakpointTest.java
  * @run main CDSBreakpointTest
  */
diff --git a/jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java b/jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java
index 1f03cacd681..0bc2eb3b3fc 100644
--- a/jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java
+++ b/jdk/test/com/sun/jdi/cds/CDSDeleteAllBkptsTest.java
@@ -31,6 +31,9 @@
  *          jdk.jartool/sun.tools.jar
  * @library /lib/testlibrary
  * @library ..
+ * @build jdk.testlibrary.*
+ * @build TestScaffold VMConnection TargetListener TargetAdapter
+ * @build CDSJDITest
  * @run compile -g ../DeleteAllBkptsTest.java
  * @run main CDSDeleteAllBkptsTest
  */
diff --git a/jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java b/jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java
index dcb4145d3ae..1b5a5e44b95 100644
--- a/jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java
+++ b/jdk/test/com/sun/jdi/cds/CDSFieldWatchpoints.java
@@ -31,6 +31,9 @@
  *          jdk.jartool/sun.tools.jar
  * @library /lib/testlibrary
  * @library ..
+ * @build jdk.testlibrary.*
+ * @build TestScaffold VMConnection TargetListener TargetAdapter
+ * @build CDSJDITest
  * @run compile -g ../FieldWatchpoints.java
  * @run main CDSFieldWatchpoints
  */