diff --git a/Makefile b/Makefile
index 452d7c57d..f24497852 100644
--- a/Makefile
+++ b/Makefile
@@ -32,13 +32,13 @@ TEST_ERLC_OPTS += +'{parse_transform, lager_transform}'
 
 EUNIT_OPTS = verbose
 
-# CT_SUITES = emqx_mqueue
+# CT_SUITES = emqx_frame
 ## emqx_trie emqx_router emqx_frame emqx_mqtt_compat
 
-CT_SUITES = emqx emqx_banned emqx_connection emqx_session emqx_access emqx_broker emqx_cm emqx_frame emqx_guid emqx_inflight \
+CT_SUITES = emqx emqx_zone emqx_banned emqx_connection emqx_session emqx_access emqx_broker emqx_cm emqx_frame emqx_guid emqx_inflight \
 			emqx_json emqx_keepalive emqx_lib emqx_metrics emqx_misc emqx_mod emqx_mqtt_caps \
 			emqx_mqtt_compat emqx_mqtt_props emqx_mqueue emqx_net emqx_pqueue emqx_router emqx_sm \
-			emqx_stats emqx_tables emqx_time emqx_topic emqx_trie emqx_vm emqx_zone \
+			emqx_stats emqx_tables emqx_time emqx_topic emqx_trie emqx_vm \
 		 	emqx_mountpoint emqx_listeners emqx_protocol
 
 CT_OPTS = -cover test/ct.cover.spec -erl_args -name emqxct@127.0.0.1
diff --git a/test/emqx_banned_SUITE.erl b/test/emqx_banned_SUITE.erl
index c8eab87b6..c91aeae45 100644
--- a/test/emqx_banned_SUITE.erl
+++ b/test/emqx_banned_SUITE.erl
@@ -38,4 +38,5 @@ t_banned_all(_) ->
     timer:sleep(100),
     ?assert(emqx_banned:check(#{client_id => <<"TestClient">>, username => undefined, peername => {undefined, undefined}})),
     emqx_banned:del({client_id, <<"TestClient">>}),
-    ?assertNot(emqx_banned:check(#{client_id => <<"TestClient">>, username => undefined, peername => {undefined, undefined}})).
+    ?assertNot(emqx_banned:check(#{client_id => <<"TestClient">>, username => undefined, peername => {undefined, undefined}})),
+    emqx_ct_broker_helpers:run_teardown_steps().
diff --git a/test/emqx_broker_SUITE.erl b/test/emqx_broker_SUITE.erl
index 0bd3dc599..8cadbf00d 100644
--- a/test/emqx_broker_SUITE.erl
+++ b/test/emqx_broker_SUITE.erl
@@ -28,7 +28,6 @@
 all() ->
     [{group, pubsub},
      {group, session},
-     {group, broker},
      {group, metrics},
      {group, stats},
      {group, alarms}].
diff --git a/test/emqx_frame_SUITE.erl b/test/emqx_frame_SUITE.erl
index 19bbb1e8c..1127f60d9 100644
--- a/test/emqx_frame_SUITE.erl
+++ b/test/emqx_frame_SUITE.erl
@@ -393,7 +393,7 @@ parse_disconnect(_) ->
     ?assertEqual({ok, ?DISCONNECT_PACKET(?RC_SUCCESS), <<>>}, parse(<<224, 0>>)).
 
 serialize_parse_disconnect(_) ->
-    Packet = ?PACKET(?DISCONNECT),
+    Packet = ?DISCONNECT_PACKET(?RC_SUCCESS),
     ?assertEqual({ok, Packet, <<>>}, parse_serialize(Packet)).
 
 serialize_parse_disconnect_v5(_) ->
diff --git a/test/emqx_mock_client.erl b/test/emqx_mock_client.erl
index 0536b8bac..85114e3a9 100644
--- a/test/emqx_mock_client.erl
+++ b/test/emqx_mock_client.erl
@@ -44,7 +44,7 @@ get_last_message() ->
 init([ClientId]) ->
     Result = lists:member(?TAB, ets:all()),
     if Result == false -> 
-        ets:new(?TAB, [set, named_table]);
+        ets:new(?TAB, [set, named_table, public]);
        true -> ok
     end,
     {ok, 
diff --git a/test/emqx_sm_SUITE.erl b/test/emqx_sm_SUITE.erl
index 24999f2a0..5e23100a9 100644
--- a/test/emqx_sm_SUITE.erl
+++ b/test/emqx_sm_SUITE.erl
@@ -38,5 +38,6 @@ t_open_close_session(_) ->
     emqx_sm:set_session_stats(Session, {open, true}),
     {open, true} = emqx_sm:get_session_stats(Session),
     ok = emqx_sm:close_session(SPid),
-    [] = emqx_sm:lookup_session(<<"client">>).
+    [] = emqx_sm:lookup_session(<<"client">>),
+    emqx_ct_broker_helpers:run_teardown_steps().