From 75c1727b7c0f99b97bc7b9bbd31b8f092259a249 Mon Sep 17 00:00:00 2001
From: md_shahbaz_yusuf <md.shahbaz.yusuf@oracle.com>
Date: Thu, 9 Oct 2025 15:26:50 +0530
Subject: [PATCH] Backport 25480f0011297ad209eca1b1b56bcf983ea4ee5d

---
 test/jdk/sun/tools/jhsdb/JShellHeapDumpTest.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/jdk/sun/tools/jhsdb/JShellHeapDumpTest.java b/test/jdk/sun/tools/jhsdb/JShellHeapDumpTest.java
index 9e9a6c79c7b..6fbc96362a9 100644
--- a/test/jdk/sun/tools/jhsdb/JShellHeapDumpTest.java
+++ b/test/jdk/sun/tools/jhsdb/JShellHeapDumpTest.java
@@ -162,12 +162,7 @@ public static void launchJshell() throws IOException {
         long startTime = System.currentTimeMillis();
         try {
             JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jshell");
-            if (doSleep) {
-                launcher.addVMArgs(Utils.getTestJavaOpts());
-            } else {
-                // Don't allow use of SerialGC. See JDK-8313655.
-                launcher.addVMArgs(Utils.getFilteredTestJavaOpts("-XX:\\+UseSerialGC"));
-            }
+            launcher.addVMArgs(Utils.getTestJavaOpts());
             ProcessBuilder pb = new ProcessBuilder(launcher.getCommand());
             // Needed so we can properly parse the "Welcome to JShell" output.
             pb.command().add("-J-Duser.language=en");