diff --git a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java
index c92dc89b5872afdbaecd0916d33f92094b2a9756..941c712492a1f580cacd657e1fdd90b54ba228d3 100644
--- a/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java
+++ b/testing/notification-test-aws/src/test/java/org/opengroup/osdu/notification/subscriptions/TestNotificationsEndpoint.java
@@ -393,8 +393,10 @@ public class TestNotificationsEndpoint {
                 List<Message> sqsMessages = messagesLists.get(0);
                 storageUtils.assertFirstMessagesSimilar(expectedStorageMessage, sqsMessages);
                 int failedCount = 0;
+                int timeout = 300;
                 while (failedCount < MAX_RETRIES) {
-                    messagesLists = pollForMessages(indexerQueue);
+                    messagesLists = pollForMessages(timeout, 1, indexerQueue);
+                    timeout = 30;
                     assertEquals(1, messagesLists.size());
                     Instant end = Instant.now();
                     sqsMessages = messagesLists.get(0);