diff --git a/apps/emqx/test/props/prop_emqx_rpc.erl b/apps/emqx/test/props/prop_emqx_rpc.erl
index 04a904806..933bef5cc 100644
--- a/apps/emqx/test/props/prop_emqx_rpc.erl
+++ b/apps/emqx/test/props/prop_emqx_rpc.erl
@@ -124,7 +124,7 @@ do_teardown(_) ->
     ok = application:stop(gen_rpc),
     ok = meck:unload(gen_rpc),
     %% wait for tcp close
-    timer:sleep(1500).
+    timer:sleep(2500).
 
 ensure_distributed_nodename() ->
     case net_kernel:start([?NODENAME]) of
diff --git a/apps/emqx_modules/test/emqx_topic_metrics_api_SUITE.erl b/apps/emqx_modules/test/emqx_topic_metrics_api_SUITE.erl
index 5558d8e82..407a832c5 100644
--- a/apps/emqx_modules/test/emqx_topic_metrics_api_SUITE.erl
+++ b/apps/emqx_modules/test/emqx_topic_metrics_api_SUITE.erl
@@ -56,6 +56,7 @@ init_per_suite(Config) ->
 
 end_per_suite(_Config) ->
     emqx_common_test_helpers:stop_apps([emqx_conf, emqx_dashboard, emqx_modules]),
+    application:stop(gen_rpc),
     ok.
 
 set_special_configs(emqx_dashboard) ->