diff --git a/test/jdk/com/sun/jdi/AllLineLocations.java b/test/jdk/com/sun/jdi/AllLineLocations.java
index f65d166d9b4..200ebedf9dc 100644
--- a/test/jdk/com/sun/jdi/AllLineLocations.java
+++ b/test/jdk/com/sun/jdi/AllLineLocations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2023, 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
@@ -31,7 +31,7 @@
  * @run compile -g RefTypes.java
  * @run build AllLineLocations
  *
- * @run driver AllLineLocations RefTypes
+ * @run driver AllLineLocations
  */
 import com.sun.jdi.*;
 import com.sun.jdi.event.*;
diff --git a/test/jdk/com/sun/jdi/ClassesByName.java b/test/jdk/com/sun/jdi/ClassesByName.java
index e9185e19c6f..d8d9ef29cf5 100644
--- a/test/jdk/com/sun/jdi/ClassesByName.java
+++ b/test/jdk/com/sun/jdi/ClassesByName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2023, 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
@@ -32,7 +32,7 @@
  *  @run compile -g HelloWorld.java
  *  @run build ClassesByName
  *
- *  @run driver ClassesByName HelloWorld
+ *  @run driver ClassesByName
  */
 import com.sun.jdi.*;
 import com.sun.jdi.event.*;
@@ -52,7 +52,7 @@ public class ClassesByName extends TestScaffold {
     }
 
     protected void runTests() throws Exception {
-        startUp("ClassesByName");
+        startUp("HelloWorld");
 
         List all = vm().allClasses();
         for (Iterator it = all.iterator(); it.hasNext(); ) {
diff --git a/test/jdk/com/sun/jdi/RedefineNestmateAttr/TestNestmateAttr.java b/test/jdk/com/sun/jdi/RedefineNestmateAttr/TestNestmateAttr.java
index 5dd0c2daf94..89c6bbcabea 100644
--- a/test/jdk/com/sun/jdi/RedefineNestmateAttr/TestNestmateAttr.java
+++ b/test/jdk/com/sun/jdi/RedefineNestmateAttr/TestNestmateAttr.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2023, 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
@@ -216,8 +216,6 @@ public class TestNestmateAttr extends TestScaffold {
     protected void startUp(String targetName) {
         List<String> argList = new ArrayList<>(Arrays.asList(args));
         argList.add(0, targetName); // pre-pend so it becomes the first "app" arg
-        // We need the class path that contains the path to jdk.test.lib.Asserts.
-        argList.add(0, " -cp " + System.getProperty("test.class.path"));
         println("run args: " + argList);
         connect((String[]) argList.toArray(args));
         waitForVMStart();
diff --git a/test/jdk/com/sun/jdi/UnpreparedByName.java b/test/jdk/com/sun/jdi/UnpreparedByName.java
index 8fd433bb262..cf6af7eeab9 100644
--- a/test/jdk/com/sun/jdi/UnpreparedByName.java
+++ b/test/jdk/com/sun/jdi/UnpreparedByName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, 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
@@ -32,7 +32,7 @@
  * @run compile -g InnerTarg.java
  * @run build UnpreparedByName
  *
- * @run driver UnpreparedByName InnerTarg
+ * @run driver UnpreparedByName
  */
 import com.sun.jdi.*;
 import com.sun.jdi.event.*;
diff --git a/test/jdk/com/sun/jdi/UnpreparedClasses.java b/test/jdk/com/sun/jdi/UnpreparedClasses.java
index 32d93b5acd9..1df5b51d2b7 100644
--- a/test/jdk/com/sun/jdi/UnpreparedClasses.java
+++ b/test/jdk/com/sun/jdi/UnpreparedClasses.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2023, 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
@@ -32,7 +32,7 @@
  * @run compile -g InnerTarg.java
  * @run build UnpreparedClasses
  *
- * @run driver UnpreparedClasses InnerTarg
+ * @run driver UnpreparedClasses
  */
 import com.sun.jdi.*;
 import com.sun.jdi.event.*;