diff --git a/deps/rabbit/test/amqp_client_SUITE.erl b/deps/rabbit/test/amqp_client_SUITE.erl
index 35f7c9d5c198..fbabfc9e1e9a 100644
--- a/deps/rabbit/test/amqp_client_SUITE.erl
+++ b/deps/rabbit/test/amqp_client_SUITE.erl
@@ -3873,7 +3873,7 @@ leader_transfer_credit(QName, QType, Credit, Config) ->
          QName,
          #{arguments => #{<<"x-queue-type">> => {utf8, QType},
                           <<"x-queue-leader-locator">> => {utf8, <<"client-local">>}}}),
-       60000),
+       60_000, 5000),
     ok = close(Init),
 
     OpnConf = connection_config(0, Config),
@@ -5456,7 +5456,7 @@ dead_letter_into_stream(Config) ->
          #{arguments => #{<<"x-queue-type">> => {utf8, <<"stream">>},
                           <<"x-initial-cluster-size">> => {ulong, 1}
                          }}),
-       60000),
+       60_000, 5000),
     {ok, Receiver} = amqp10_client:attach_receiver_link(
                        Session1, <<"receiver">>, <<"/amq/queue/", QName1/binary>>,
                        settled, configuration,
diff --git a/deps/rabbitmq_amqp_client/src/rabbitmq_amqp_client.erl b/deps/rabbitmq_amqp_client/src/rabbitmq_amqp_client.erl
index 2ef253931aa6..e4c02767b988 100644
--- a/deps/rabbitmq_amqp_client/src/rabbitmq_amqp_client.erl
+++ b/deps/rabbitmq_amqp_client/src/rabbitmq_amqp_client.erl
@@ -33,7 +33,7 @@
         set_token/2
        ].
 
--define(TIMEOUT, 20_000).
+-define(TIMEOUT, 30_000).
 -define(MANAGEMENT_NODE_ADDRESS, <<"/management">>).
 
 -type arguments() :: #{binary() => {atom(), term()}}.