diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index 6140d22eaf..f274e2aa77 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -42,6 +42,7 @@ import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
 import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException;
 import org.apache.activemq.artemis.api.core.ActiveMQTimeoutException;
 import org.apache.activemq.artemis.api.core.JsonUtil;
@@ -4337,7 +4338,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
 
       ActiveMQServerControl serverControl = createManagementControl();
       try {
-         serverControl.restartEmbeddedWebServer(10);
+         serverControl.restartEmbeddedWebServer(1);
          fail();
       } catch (ActiveMQTimeoutException e) {
          // expected
@@ -4356,10 +4357,10 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
 
       ActiveMQServerControl serverControl = createManagementControl();
       try {
-         serverControl.restartEmbeddedWebServer(10);
+         serverControl.restartEmbeddedWebServer(1000);
          fail();
-      } catch (ActiveMQIllegalStateException e) {
-         assertEquals(message, e.getMessage());
+      } catch (ActiveMQException e) {
+         assertSame("Unexpected cause", startException, e.getCause());
       }
    }
 
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
index 0988b1d527..b7c412874f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
@@ -45,6 +45,15 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes
    public void testScaleDownWithConnector() throws Exception {
    }
 
+   // the proxy will not work on these tests, ignoring the tests
+   @Override
+   public void testRestartEmbeddedWebServerException() throws Exception {
+   }
+
+   @Override
+   public void testRestartEmbeddedWebServerTimeout() throws Exception {
+   }
+
 
 
    @Override