diff --git a/test/jdk/ProblemList-svc-vthread.txt b/test/jdk/ProblemList-svc-vthread.txt
index 49469f226d1..97e7c43cdea 100644
--- a/test/jdk/ProblemList-svc-vthread.txt
+++ b/test/jdk/ProblemList-svc-vthread.txt
@@ -51,16 +51,4 @@ com/sun/jdi/RedefineTTYLineNumber.java 8285422 generic-all
 com/sun/jdi/ReferrersTest.java 8285422 generic-all
 com/sun/jdi/SetLocalWhileThreadInNative.java 8285422 generic-all
 com/sun/jdi/StepTest.java 8285422 generic-all
-com/sun/jdi/redefine/RedefineTest.java 8285422 generic-all
-com/sun/jdi/redefineMethod/RedefineTest.java 8285422 generic-all
 com/sun/jdi/PopAndInvokeTest.java 8305632 generic-all
-
-####
-# JDI SDE Tests
-# Use custom classpath
-
-com/sun/jdi/sde/FilterMangleTest.java 8285423 generic-all
-com/sun/jdi/sde/MangleTest.java 8285423 generic-all
-com/sun/jdi/sde/MangleStepTest.java 8285423 generic-all
-com/sun/jdi/sde/TemperatureTableTest.java 8285423 generic-all
-com/sun/jdi/sde/SourceDebugExtensionTest.java 8285423 generic-all
diff --git a/test/jdk/com/sun/jdi/VMConnection.java b/test/jdk/com/sun/jdi/VMConnection.java
index a9e5355a321..2ef25f313ba 100644
--- a/test/jdk/com/sun/jdi/VMConnection.java
+++ b/test/jdk/com/sun/jdi/VMConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2008, 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
@@ -49,13 +49,14 @@ class VMConnection {
     static public String getDebuggeeVMOptions() {
         String retVal = "";
 
-        // When we run under jtreg, test.classes contains the pathname of
-        // the dir in which the .class files will be placed.
-        String testClasses = System.getProperty("test.classes");
-        if (testClasses == null) {
+        // When we run under jtreg, test.class.path contains classpath
+        // with test and testlibrary compiled classes
+        String testClassPath = System.getProperty("test.class.path");
+
+        if (testClassPath == null) {
             return retVal;
         }
-        retVal += "-classpath " + testClasses;
+        retVal += "-classpath " + testClassPath;
 
         String vmOpts = System.getProperty("test.vm.opts");
         System.out.println("vmOpts: '" + vmOpts + "'");