diff --git a/apps/emqx/test/emqx_banned_SUITE.erl b/apps/emqx/test/emqx_banned_SUITE.erl
index e983edb42..d8827721f 100644
--- a/apps/emqx/test/emqx_banned_SUITE.erl
+++ b/apps/emqx/test/emqx_banned_SUITE.erl
@@ -95,6 +95,7 @@ t_check(_) ->
     ?assertEqual(0, emqx_banned:info(size)).
 
 t_unused(_) ->
+    catch emqx_banned:stop(),
     {ok, Banned} = emqx_banned:start_link(),
     {ok, _} = emqx_banned:create(#banned{
         who = {clientid, <<"BannedClient1">>},
diff --git a/apps/emqx/test/emqx_listeners_SUITE.erl b/apps/emqx/test/emqx_listeners_SUITE.erl
index ba7a577d3..6603d89d4 100644
--- a/apps/emqx/test/emqx_listeners_SUITE.erl
+++ b/apps/emqx/test/emqx_listeners_SUITE.erl
@@ -43,6 +43,7 @@ end_per_suite(_Config) ->
 init_per_testcase(Case, Config) when
     Case =:= t_max_conns_tcp; Case =:= t_current_conns_tcp
 ->
+    catch emqx_config_handler:stop(),
     {ok, _} = emqx_config_handler:start_link(),
     PrevListeners = emqx_config:get([listeners, tcp], #{}),
     PrevRateLimit = emqx_config:get([rate_limit], #{}),
@@ -64,6 +65,7 @@ init_per_testcase(Case, Config) when
         | Config
     ];
 init_per_testcase(t_wss_conn, Config) ->
+    catch emqx_config_handler:stop(),
     {ok, _} = emqx_config_handler:start_link(),
     PrevListeners = emqx_config:get([listeners, wss], #{}),
     emqx_config:put(
@@ -86,6 +88,7 @@ init_per_testcase(t_wss_conn, Config) ->
         | Config
     ];
 init_per_testcase(_, Config) ->
+    catch emqx_config_handler:stop(),
     {ok, _} = emqx_config_handler:start_link(),
     Config.
 
diff --git a/apps/emqx/test/emqx_request_responser_SUITE.erl b/apps/emqx/test/emqx_request_responser_SUITE.erl
index 9daab6f96..41ae7f57d 100644
--- a/apps/emqx/test/emqx_request_responser_SUITE.erl
+++ b/apps/emqx/test/emqx_request_responser_SUITE.erl
@@ -30,11 +30,15 @@ end_per_suite(_Config) ->
     emqx_common_test_helpers:stop_apps([]).
 
 all() ->
-    [request_response].
+    emqx_common_test_helpers:all(?MODULE).
 
-request_response(_Config) ->
-    request_response_per_qos(?QOS_0),
-    request_response_per_qos(?QOS_1),
+t_request_response_qos0(_Config) ->
+    request_response_per_qos(?QOS_0).
+
+t_request_response_qos1(_Config) ->
+    request_response_per_qos(?QOS_1).
+
+t_request_response_qos2(_Config) ->
     request_response_per_qos(?QOS_2).
 
 request_response_per_qos(QoS) ->