diff --git a/deps/rabbit/test/quorum_queue_SUITE.erl b/deps/rabbit/test/quorum_queue_SUITE.erl
index 6f3fa5fe98..44ef1d38a5 100644
--- a/deps/rabbit/test/quorum_queue_SUITE.erl
+++ b/deps/rabbit/test/quorum_queue_SUITE.erl
@@ -212,6 +212,8 @@ init_per_group(Group, Config) ->
                             %% more time after clustering before running the
                             %% tests.
                             timer:sleep(ClusterSize * 1000),
+                            ok = rabbit_ct_broker_helpers:enable_feature_flag(
+                                   Config2, maintenance_mode_status),
                             Config2;
                         Skip ->
                             end_per_group(Group, Config2),
@@ -2650,7 +2652,7 @@ leader_locator_balanced_maintenance(Config) ->
           ?config(alt_queue_name, Config),
           <<"leader_locator_policy_q3">>],
 
-    rabbit_ct_broker_helpers:mark_as_being_drained(Config, S2),
+    true = rabbit_ct_broker_helpers:mark_as_being_drained(Config, S2),
     Leaders = [begin
                    ?assertMatch({'queue.declare_ok', Q, 0, 0},
                                 declare(Ch, Q,
@@ -2663,7 +2665,7 @@ leader_locator_balanced_maintenance(Config) ->
     ?assertNot(lists:member(S2, Leaders)),
     ?assert(lists:member(S3, Leaders)),
 
-    rabbit_ct_broker_helpers:unmark_as_being_drained(Config, S2),
+    true = rabbit_ct_broker_helpers:unmark_as_being_drained(Config, S2),
     [?assertMatch(#'queue.delete_ok'{},
                   amqp_channel:call(Ch, #'queue.delete'{queue = Q}))
      || Q <- Qs].
diff --git a/deps/rabbit/test/rabbit_stream_queue_SUITE.erl b/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
index edd8082f4b..2244528bdc 100644
--- a/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
+++ b/deps/rabbit/test/rabbit_stream_queue_SUITE.erl
@@ -184,6 +184,8 @@ init_per_group1(Group, Config) ->
                     ok = rabbit_ct_broker_helpers:rpc(
                            Config2, 0, application, set_env,
                            [rabbit, channel_tick_interval, 100]),
+                    ok = rabbit_ct_broker_helpers:enable_feature_flag(
+                           Config2, maintenance_mode_status),
                     Config2;
                 {skip, _} = Skip ->
                     end_per_group(Group, Config2),
@@ -1884,7 +1886,7 @@ leader_locator_balanced_maintenance(Config) ->
     ?assertEqual({'queue.declare_ok', Q2, 0, 0},
                  declare(Ch2, Q2, [{<<"x-queue-type">>, longstr, <<"stream">>},
                                    {<<"x-queue-leader-locator">>, longstr, <<"client-local">>}])),
-    rabbit_ct_broker_helpers:mark_as_being_drained(Config, Server3),
+    true = rabbit_ct_broker_helpers:mark_as_being_drained(Config, Server3),
     ?assertEqual({'queue.declare_ok', Q, 0, 0},
                  declare(Ch1, Q, [{<<"x-queue-type">>, longstr, <<"stream">>},
                                   {<<"x-queue-leader-locator">>, longstr, <<"balanced">>}])),
@@ -1893,7 +1895,7 @@ leader_locator_balanced_maintenance(Config) ->
     Leader = proplists:get_value(leader, Info),
     ?assert(lists:member(Leader, [Server1, Server2])),
 
-    rabbit_ct_broker_helpers:unmark_as_being_drained(Config, Server3),
+    true = rabbit_ct_broker_helpers:unmark_as_being_drained(Config, Server3),
     rabbit_ct_broker_helpers:rpc(Config, 0, ?MODULE, delete_testcase_queue, [Q]).
 
 select_nodes_with_least_replicas(Config) ->