diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
index dac67fccb6..5521814520 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
@@ -1604,20 +1604,19 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
          }
 
          Object[] addressResources = server.getManagementService().getResources(AddressControl.class);
-         AddressControl addressControl = null;
 
          for (Object addressResource : addressResources) {
 
             if (((AddressControl) addressResource).getAddress().equals("ActiveMQ.Advisory.TempQueue")) {
-               addressControl = (AddressControl) addressResource;
+               AddressControl addressControl = (AddressControl) addressResource;
+               Wait.waitFor(() -> addressControl.getMessageCount() == 0);
+               assertNotNull("addressControl for temp advisory", addressControl);
+               assertEquals(0, addressControl.getMessageCount());
             }
          }
 
-         assertNotNull("addressControl for temp advisory", addressControl);
 
          //sleep a bit to allow message count to go down.
-         Thread.sleep(50);
-         assertEquals(0, addressControl.getMessageCount());
       } finally {
          for (Connection conn : connections) {
             if (conn != null) {