diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
index 6d42d7b9f511..f3d4233f3660 100644
--- a/deps/rabbit/BUILD.bazel
+++ b/deps/rabbit/BUILD.bazel
@@ -714,6 +714,7 @@ rabbitmq_suite(
         "@gen_batch_server//:erlang_app",
         "@meck//:erlang_app",
         "@ra//:erlang_app",
+        "//deps/rabbitmq_ct_helpers:erlang_app",
     ],
 )
 
diff --git a/deps/rabbit/app.bzl b/deps/rabbit/app.bzl
index 659ef70eb8c3..7586ab97adbf 100644
--- a/deps/rabbit/app.bzl
+++ b/deps/rabbit/app.bzl
@@ -1329,7 +1329,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         outs = ["test/rabbit_fifo_int_SUITE.beam"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app"],
+        deps = ["//deps/rabbit_common:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
     )
     erlang_bytecode(
         name = "rabbit_fifo_prop_SUITE_beam_files",
diff --git a/deps/rabbit/test/rabbit_fifo_int_SUITE.erl b/deps/rabbit/test/rabbit_fifo_int_SUITE.erl
index 2ae8e4bc55f8..fae1251d4738 100644
--- a/deps/rabbit/test/rabbit_fifo_int_SUITE.erl
+++ b/deps/rabbit/test/rabbit_fifo_int_SUITE.erl
@@ -380,6 +380,16 @@ returns_after_down(Config) ->
     after 5000 ->
               ct:fail("waiting for process exit timed out")
     end,
+    rabbit_ct_helpers:await_condition(
+      fun () ->
+                case ra:member_overview(ServerId) of
+                    {ok, #{machine := #{num_consumers := 0}}, _} ->
+                        true;
+                    X ->
+                        ct:pal("X ~p", [X]),
+                        false
+                end
+      end),
     % message should be available for dequeue
     {ok, _, {_, _, _, _, Msg1Out}, _} =
         rabbit_fifo_client:dequeue(ClusterName, <<"tag">>, settled, F2),