diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
index d4706f6827..1ff0a89bc2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/RedeployTest.java
@@ -485,6 +485,8 @@ public class RedeployTest extends ActiveMQTestBase {
 
          deployBrokerConfig(embeddedActiveMQ, newConfig);
 
+         Wait.waitFor(() -> embeddedActiveMQ.getActiveMQServer().getPostOffice()
+                         .getBinding(new SimpleString("divert")) == null);
          divertBinding = (DivertBinding) embeddedActiveMQ.getActiveMQServer().getPostOffice()
                  .getBinding(new SimpleString("divert"));
          assertNull(divertBinding);
@@ -500,7 +502,7 @@ public class RedeployTest extends ActiveMQTestBase {
             Message message = session.createTextMessage("Hello world");
             sourceProducer.send(message);
             assertNotNull(sourceConsumer.receive(2000));
-            assertNull(targetConsumer.receive(2000));
+            assertNull(targetConsumer.receiveNoWait());
          }
       } finally {
          embeddedActiveMQ.stop();
diff --git a/tests/integration-tests/src/test/resources/reload-queue-defaults-after.xml b/tests/integration-tests/src/test/resources/reload-queue-defaults-after.xml
index ecc4ecd7b3..2ea4bdfd54 100644
--- a/tests/integration-tests/src/test/resources/reload-queue-defaults-after.xml
+++ b/tests/integration-tests/src/test/resources/reload-queue-defaults-after.xml
@@ -25,6 +25,7 @@ under the License.
    <core xmlns="urn:activemq:core">
       <security-enabled>false</security-enabled>
       <persistence-enabled>false</persistence-enabled>
+      <configuration-file-refresh-period>100</configuration-file-refresh-period>
 
       <acceptors>
          <acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>
diff --git a/tests/integration-tests/src/test/resources/reload-queue-defaults-before.xml b/tests/integration-tests/src/test/resources/reload-queue-defaults-before.xml
index 8a7521d5a6..e6e8b63a9d 100644
--- a/tests/integration-tests/src/test/resources/reload-queue-defaults-before.xml
+++ b/tests/integration-tests/src/test/resources/reload-queue-defaults-before.xml
@@ -25,6 +25,7 @@ under the License.
    <core xmlns="urn:activemq:core">
       <security-enabled>false</security-enabled>
       <persistence-enabled>false</persistence-enabled>
+      <configuration-file-refresh-period>100</configuration-file-refresh-period>
 
       <acceptors>
          <acceptor name="artemis">tcp://0.0.0.0:61616</acceptor>