diff --git a/deps/rabbit/test/quorum_queue_SUITE.erl b/deps/rabbit/test/quorum_queue_SUITE.erl
index b46ad2a8cb9f..b0a93786b8bf 100644
--- a/deps/rabbit/test/quorum_queue_SUITE.erl
+++ b/deps/rabbit/test/quorum_queue_SUITE.erl
@@ -2423,11 +2423,21 @@ confirm_availability_on_leader_change(Config) ->
     ok.
 
 wait_for_new_messages(Config, Node, Name, Increase) ->
+    wait_for_new_messages(Config, Node, Name, Increase, 60000).
+
+wait_for_new_messages(Config, Node, Name, Increase, Timeout) ->
     Infos = rabbit_ct_broker_helpers:rabbitmqctl_list(
               Config, Node, ["list_queues", "name", "messages"]),
-    [[Name, Msgs0]] = [Props || Props <- Infos, hd(Props) == Name],
-    Msgs = binary_to_integer(Msgs0),
-    queue_utils:wait_for_min_messages(Config, Name, Msgs + Increase).
+    case [Props || Props <- Infos, hd(Props) == Name] of
+        [[Name, Msgs0]] ->
+            Msgs = binary_to_integer(Msgs0),
+            queue_utils:wait_for_min_messages(Config, Name, Msgs + Increase);
+        _ when Timeout >= 0 ->
+            Sleep = 200,
+            timer:sleep(Sleep),
+            wait_for_new_messages(
+              Config, Node, Name, Increase, Timeout - Sleep)
+    end.
 
 flush(T) ->
     receive X ->
diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk
index 0319eabc8477..803e93b03305 100644
--- a/rabbitmq-components.mk
+++ b/rabbitmq-components.mk
@@ -47,7 +47,7 @@ dep_cuttlefish = hex 3.4.0
 dep_gen_batch_server = hex 0.8.8
 dep_jose = hex 1.11.10
 dep_khepri = hex 0.16.0
-dep_khepri_mnesia_migration = hex 0.7.1
+dep_khepri_mnesia_migration = hex 0.7.2
 dep_meck = hex 1.0.0
 dep_osiris = git https://github.com/rabbitmq/osiris v1.8.6
 dep_prometheus = hex 4.11.0