diff --git a/bundles/io.openliberty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/DevModeOperations.java b/bundles/io.openliberty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/DevModeOperations.java
index 1e4cd4a4..7ae81f7b 100644
--- a/bundles/io.openliberty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/DevModeOperations.java
+++ b/bundles/io.openliberty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/DevModeOperations.java
@@ -74,7 +74,7 @@ public class DevModeOperations {
     public static final String BROWSER_MVN_UT_REPORT_NAME_SUFFIX = "surefire report";
     public static final String BROWSER_GRADLE_TEST_REPORT_NAME_SUFFIX = "test report";
 
-    private static final int STOP_TIMEOUT_SECONDS = 40;
+    private static final int STOP_TIMEOUT_SECONDS = 60;
     protected static final QualifiedName STOP_JOB_COMPLETION_TIMEOUT = new QualifiedName("io.openliberty.tools.eclipse.ui",
             "stopJobCompletionTimeout");
     protected static final QualifiedName STOP_JOB_COMPLETION_EXIT_CODE = new QualifiedName("io.openliberty.tools.eclipse.ui",
diff --git a/tests/src/main/java/io/openliberty/tools/eclipse/test/it/utils/LibertyPluginTestUtils.java b/tests/src/main/java/io/openliberty/tools/eclipse/test/it/utils/LibertyPluginTestUtils.java
index 60434771..f1247d2c 100644
--- a/tests/src/main/java/io/openliberty/tools/eclipse/test/it/utils/LibertyPluginTestUtils.java
+++ b/tests/src/main/java/io/openliberty/tools/eclipse/test/it/utils/LibertyPluginTestUtils.java
@@ -67,7 +67,7 @@ public static void validateApplicationOutcome(String ctxRoot, boolean expectSucc
      */
     public static void validateLibertyServerStopped(String testAppPath) {
         String wlpMsgLogPath = testAppPath + "/wlp/usr/servers/defaultServer/logs/messages.log";
-        int maxAttempts = 20;
+        int maxAttempts = 30;
         boolean foundStoppedMsg = false;
 
         // Find message CWWKE0036I: The server x stopped after y seconds
@@ -84,7 +84,7 @@ public static void validateLibertyServerStopped(String testAppPath) {
                 if (foundStoppedMsg) {
                     break;
                 } else {
-                    Thread.sleep(2000);
+                    Thread.sleep(3000);
                 }
             } catch (Exception e) {
                 Assertions.fail("Caught exception waiting for stop message", e);