diff --git a/test/langtools/jdk/jshell/JdiBadOptionListenExecutionControlTest.java b/test/langtools/jdk/jshell/JdiBadOptionListenExecutionControlTest.java
index 422c6c18b7565..130913df8d43f 100644
--- a/test/langtools/jdk/jshell/JdiBadOptionListenExecutionControlTest.java
+++ b/test/langtools/jdk/jshell/JdiBadOptionListenExecutionControlTest.java
@@ -47,7 +47,7 @@ public void badOptionListenTest() {
             // turn on logging of launch failures
             Logger.getLogger("jdk.jshell.execution").setLevel(Level.ALL);
             JShell.builder()
-                    .executionEngine("jdi")
+                    .executionEngine(Presets.TEST_JDI_EXECUTION)
                     .remoteVMOptions("-BadBadOption")
                     .build();
         } catch (IllegalStateException ex) {
diff --git a/test/langtools/jdk/jshell/JdiListeningExecutionControlTest.java b/test/langtools/jdk/jshell/JdiListeningExecutionControlTest.java
index 3cc2a9785a3c5..a941845ba497f 100644
--- a/test/langtools/jdk/jshell/JdiListeningExecutionControlTest.java
+++ b/test/langtools/jdk/jshell/JdiListeningExecutionControlTest.java
@@ -39,6 +39,6 @@ public class JdiListeningExecutionControlTest extends ExecutionControlTestBase {
     @BeforeEach
     @Override
     public void setUp() {
-        setUp(builder -> builder.executionEngine("jdi"));
+        setUp(builder -> builder.executionEngine(Presets.TEST_JDI_EXECUTION));
     }
 }
diff --git a/test/langtools/jdk/jshell/Presets.java b/test/langtools/jdk/jshell/Presets.java
index b9a93c967dc71..afe193ee5c3ae 100644
--- a/test/langtools/jdk/jshell/Presets.java
+++ b/test/langtools/jdk/jshell/Presets.java
@@ -25,16 +25,23 @@
 import java.util.*;
 
 public class Presets {
+    private static final int TEST_TIMEOUT = 20_000;
+
     public static final String TEST_DEFAULT_EXECUTION;
     public static final String TEST_STANDARD_EXECUTION;
+    public static final String TEST_JDI_EXECUTION;
 
     static {
         String loopback = InetAddress.getLoopbackAddress().getHostAddress();
 
         TEST_DEFAULT_EXECUTION = "failover:0(jdi:hostname(" + loopback + "))," +
-                                 "1(jdi:launch(true)), 2(jdi), 3(local)";
+                                 "1(jdi:launch(true))," +
+                                 "2(jdi:timeout(" + TEST_TIMEOUT + "))," +
+                                 "3(local)";
         TEST_STANDARD_EXECUTION = "failover:0(jdi:hostname(" + loopback + "))," +
-                                  "1(jdi:launch(true)), 2(jdi)";
+                                  "1(jdi:launch(true))," +
+                                  "2(jdi:timeout(" + TEST_TIMEOUT + "))";
+        TEST_JDI_EXECUTION = "jdi:timeout(" + TEST_TIMEOUT + ")";
     }
 
     public static String[] addExecutionIfMissing(String[] args) {