diff --git a/test/emqx_access_control_SUITE.erl b/test/emqx_access_control_SUITE.erl
index 06483b895..53bdba35d 100644
--- a/test/emqx_access_control_SUITE.erl
+++ b/test/emqx_access_control_SUITE.erl
@@ -29,12 +29,12 @@ init_per_testcase(_TestCase, Config) ->
 end_per_testcase(_TestCase, Config) ->
     Config.
 
-t_authenticate(_) ->
-    error('TODO').
+% t_authenticate(_) ->
+%     error('TODO').
 
-t_check_acl(_) ->
-    error('TODO').
+% t_check_acl(_) ->
+%     error('TODO').
 
-t_reload_acl(_) ->
-    error('TODO').
+% t_reload_acl(_) ->
+%     error('TODO').
 
diff --git a/test/emqx_access_rule_SUITE.erl b/test/emqx_access_rule_SUITE.erl
index 36f887403..667df5bc2 100644
--- a/test/emqx_access_rule_SUITE.erl
+++ b/test/emqx_access_rule_SUITE.erl
@@ -29,9 +29,9 @@ init_per_testcase(_TestCase, Config) ->
 end_per_testcase(_TestCase, Config) ->
     Config.
 
-t_compile(_) ->
-    error('TODO').
+% t_compile(_) ->
+%     error('TODO').
 
-t_match(_) ->
-    error('TODO').
+% t_match(_) ->
+%     error('TODO').
 
diff --git a/test/emqx_acl_cache_SUITE.erl b/test/emqx_acl_cache_SUITE.erl
index 67fde1df0..934f3de2a 100644
--- a/test/emqx_acl_cache_SUITE.erl
+++ b/test/emqx_acl_cache_SUITE.erl
@@ -57,39 +57,39 @@ t_clean_acl_cache(_Config) ->
     ?assertEqual(0, length(gen_server:call(ClientPid, list_acl_cache))),
     emqtt:stop(Client).
 
-t_cache_k(_) ->
-    error('TODO').
+% t_cache_k(_) ->
+%     error('TODO').
 
-t_cache_v(_) ->
-    error('TODO').
+% t_cache_v(_) ->
+%     error('TODO').
 
-t_cleanup_acl_cache(_) ->
-    error('TODO').
+% t_cleanup_acl_cache(_) ->
+%     error('TODO').
 
-t_get_oldest_key(_) ->
-    error('TODO').
+% t_get_oldest_key(_) ->
+%     error('TODO').
 
-t_get_newest_key(_) ->
-    error('TODO').
+% t_get_newest_key(_) ->
+%     error('TODO').
 
-t_get_cache_max_size(_) ->
-    error('TODO').
+% t_get_cache_max_size(_) ->
+%     error('TODO').
 
-t_get_cache_size(_) ->
-    error('TODO').
+% t_get_cache_size(_) ->
+%     error('TODO').
 
-t_dump_acl_cache(_) ->
-    error('TODO').
+% t_dump_acl_cache(_) ->
+%     error('TODO').
 
-t_empty_acl_cache(_) ->
-    error('TODO').
+% t_empty_acl_cache(_) ->
+%     error('TODO').
 
-t_put_acl_cache(_) ->
-    error('TODO').
+% t_put_acl_cache(_) ->
+%     error('TODO').
 
-t_get_acl_cache(_) ->
-    error('TODO').
+% t_get_acl_cache(_) ->
+%     error('TODO').
 
-t_is_enabled(_) ->
-    error('TODO').
+% t_is_enabled(_) ->
+%     error('TODO').
 
diff --git a/test/emqx_base62_SUITE.erl b/test/emqx_base62_SUITE.erl
index 413fe660b..83d11ae1c 100644
--- a/test/emqx_base62_SUITE.erl
+++ b/test/emqx_base62_SUITE.erl
@@ -24,13 +24,6 @@
 
 all() -> emqx_ct:all(?MODULE).
 
-t_encode(_) ->
-    error('TODO').
-
-t_decode(_) ->
-    error('TODO').
-
-
 t_proper_base62(_) ->
     Opts = [{numtests, 100}, {to_file, user}],
     ?assert(proper:quickcheck(prop_symmetric(), Opts)),
diff --git a/test/emqx_batch_SUITE.erl b/test/emqx_batch_SUITE.erl
index df9f7f778..e45e89c83 100644
--- a/test/emqx_batch_SUITE.erl
+++ b/test/emqx_batch_SUITE.erl
@@ -23,22 +23,6 @@
 
 all() -> emqx_ct:all(?MODULE).
 
-
-t_init(_) ->
-    error('TODO').
-
-t_push(_) ->
-    error('TODO').
-
-t_commit(_) ->
-    error('TODO').
-
-t_size(_) ->
-    error('TODO').
-
-t_items(_) ->
-    error('TODO').
-
 t_batch_full_commit(_) ->
     B0 = emqx_batch:init(#{batch_size => 3,
                            linger_ms => 2000,
diff --git a/test/emqx_cm_SUITE.erl b/test/emqx_cm_SUITE.erl
index 0e13bd785..d0c2dde96 100644
--- a/test/emqx_cm_SUITE.erl
+++ b/test/emqx_cm_SUITE.erl
@@ -89,26 +89,26 @@ t_lock_clientid(_) ->
     {true, _Nodes} = emqx_cm_locker:unlock(<<"clientid">>).
 
 
-t_unregister_channel(_) ->
-    error('TODO').
+% t_unregister_channel(_) ->
+%     error('TODO').
 
-t_get_chan_attrs(_) ->
-    error('TODO').
+% t_get_chan_attrs(_) ->
+%     error('TODO').
 
-t_get_chan_stats(_) ->
-    error('TODO').
+% t_get_chan_stats(_) ->
+%     error('TODO').
 
-t_lookup_channels(_) ->
-    error('TODO').
+% t_lookup_channels(_) ->
+%     error('TODO').
 
-t_set_chan_stats(_) ->
-    error('TODO').
+% t_set_chan_stats(_) ->
+%     error('TODO').
 
-t_set_chan_attrs(_) ->
-    error('TODO').
+% t_set_chan_attrs(_) ->
+%     error('TODO').
 
-t_register_channel(_) ->
-    error('TODO').
+% t_register_channel(_) ->
+%     error('TODO').
 
-t_stats_fun(_) ->
-    error('TODO').
+% t_stats_fun(_) ->
+%     error('TODO').
diff --git a/test/emqx_cm_locker_SUITE.erl b/test/emqx_cm_locker_SUITE.erl
index 937305c23..f476c99ac 100644
--- a/test/emqx_cm_locker_SUITE.erl
+++ b/test/emqx_cm_locker_SUITE.erl
@@ -29,15 +29,15 @@ init_per_testcase(_TestCase, Config) ->
 end_per_testcase(_TestCase, Config) ->
     Config.
 
-t_start_link(_) ->
-    error('TODO').
+% t_start_link(_) ->
+%     error('TODO').
 
-t_trans(_) ->
-    error('TODO').
+% t_trans(_) ->
+%     error('TODO').
 
-t_lock(_) ->
-    error('TODO').
+% t_lock(_) ->
+%     error('TODO').
 
-t_unlock(_) ->
-    error('TODO').
+% t_unlock(_) ->
+%     error('TODO').
 
diff --git a/test/emqx_flapping_SUITE.erl b/test/emqx_flapping_SUITE.erl
index 430edcc3a..a9234c541 100644
--- a/test/emqx_flapping_SUITE.erl
+++ b/test/emqx_flapping_SUITE.erl
@@ -38,14 +38,6 @@ set_special_configs(_App) -> ok.
 end_per_suite(_Config) ->
     emqx_ct_helpers:stop_apps([]),
     ok.
-    
-    
-t_check(_) ->
-    error('TODO').
-
-t_detect(_) ->
-    error('TODO').
-
 
 t_detect_check(_) ->
     ClientInfo = #{zone => external,
diff --git a/test/emqx_guid_SUITE.erl b/test/emqx_guid_SUITE.erl
index 56fcd8aaf..eec808ae2 100644
--- a/test/emqx_guid_SUITE.erl
+++ b/test/emqx_guid_SUITE.erl
@@ -39,26 +39,3 @@ t_guid_hexstr(_) ->
 t_guid_base62(_) ->
     Guid = emqx_guid:gen(),
     ?assertEqual(Guid, emqx_guid:from_base62(emqx_guid:to_base62(Guid))).
-    
-t_new(_) ->
-    error('TODO').
-
-t_timestamp(_) ->
-    error('TODO').
-
-t_to_hexstr(_) ->
-    error('TODO').
-
-t_from_hexstr(_) ->
-    error('TODO').
-
-t_from_base62(_) ->
-    error('TODO').
-
-t_to_base62(_) ->
-    error('TODO').
-
-t_gen(_) ->
-    error('TODO').
-
-
diff --git a/test/emqx_hooks_SUITE.erl b/test/emqx_hooks_SUITE.erl
index e5d04bd6d..b5670ecc1 100644
--- a/test/emqx_hooks_SUITE.erl
+++ b/test/emqx_hooks_SUITE.erl
@@ -23,25 +23,21 @@
 
 all() -> emqx_ct:all(?MODULE).
 
+% t_lookup(_) ->
+%     error('TODO').
 
+% t_run_fold(_) ->
+%     error('TODO').
 
-t_lookup(_) ->
-    error('TODO').
+% t_run(_) ->
+%     error('TODO').
 
+% t_del(_) ->
+%     error('TODO').
 
-t_run_fold(_) ->
-    error('TODO').
-
-t_run(_) ->
-    error('TODO').
-
-t_del(_) ->
-    error('TODO').
-
-t_add(_) ->
-    error('TODO').
+% t_add(_) ->
+%     error('TODO').
     
-
 t_add_del_hook(_) ->
     {ok, _} = emqx_hooks:start_link(),
     ok = emqx:hook(test_hook, fun ?MODULE:hook_fun1/1, []),
diff --git a/test/emqx_inflight_SUITE.erl b/test/emqx_inflight_SUITE.erl
index f441b0f81..21b8350de 100644
--- a/test/emqx_inflight_SUITE.erl
+++ b/test/emqx_inflight_SUITE.erl
@@ -23,10 +23,6 @@
 -include_lib("emqx_ct_helpers/include/emqx_ct.hrl").
 
 all() -> emqx_ct:all(?MODULE).
-
-
-t_new(_) ->
-    error('TODO').
     
 t_contain(_) ->
     Inflight = emqx_inflight:insert(k, v, emqx_inflight:new()),
@@ -94,12 +90,5 @@ t_window(_) ->
                          a, 1, emqx_inflight:new(2))),
     ?assertEqual([a, b], emqx_inflight:window(Inflight)).
 
-t_to_list(_) ->
-    error('TODO').
-
-t_size(_) ->
-    error('TODO').
-
-t_max_size(_) ->
-    error('TODO').
-
+% t_to_list(_) ->
+%     error('TODO').
diff --git a/test/emqx_keepalive_SUITE.erl b/test/emqx_keepalive_SUITE.erl
index 58c3d0af0..0bdc79f60 100644
--- a/test/emqx_keepalive_SUITE.erl
+++ b/test/emqx_keepalive_SUITE.erl
@@ -23,13 +23,6 @@
 
 all() -> emqx_ct:all(?MODULE).
 
-
-t_init(_) ->
-    error('TODO').
-
-t_info(_) ->
-    error('TODO').
-
 t_check(_) ->
     Keepalive = emqx_keepalive:init(60),
     ?assertEqual(60, emqx_keepalive:info(interval, Keepalive)),
diff --git a/test/emqx_logger_SUITE.erl b/test/emqx_logger_SUITE.erl
index 4b0dc2c9a..0327204cb 100644
--- a/test/emqx_logger_SUITE.erl
+++ b/test/emqx_logger_SUITE.erl
@@ -82,8 +82,8 @@ t_set_log_level(_) ->
     ?assertMatch({error, _Error}, ?LOGGER:set_log_level(for_test)),
     ?assertEqual(ok, ?LOGGER:set_log_level(debug)).
 
-t_parse_transform(_) ->
-    error('TODO').
+% t_parse_transform(_) ->
+%     error('TODO').
 
 t_set_metadata_peername(_) ->
     ?assertEqual(ok, ?LOGGER:set_metadata_peername("for_test")).
diff --git a/test/emqx_message_SUITE.erl b/test/emqx_message_SUITE.erl
index 160b15aa1..94a0fb1f6 100644
--- a/test/emqx_message_SUITE.erl
+++ b/test/emqx_message_SUITE.erl
@@ -91,9 +91,6 @@ t_undefined_headers(_) ->
     ?assertEqual(1, emqx_message:get_header(a, Msg1)),
     Msg2 = emqx_message:set_header(c, 3, Msg),
     ?assertEqual(3, emqx_message:get_header(c, Msg2)).
-      
-t_remove_header(_) ->
-    error('TODO').
 
 t_format(_) ->
     Msg = emqx_message:make(<<"clientid">>, <<"topic">>, <<"payload">>),
@@ -118,9 +115,8 @@ t_is_expired(_) ->
     Msg2 = emqx_message:update_expiry(Msg1),
     ?assertEqual(1, emqx_message:get_header('Message-Expiry-Interval', Msg2)).
 
-
-t_to_list(_) ->
-    error('TODO').
+% t_to_list(_) ->
+%     error('TODO').
     
 t_to_packet(_) ->
     Pkt = #mqtt_packet{header = #mqtt_packet_header{type   = ?PUBLISH,
@@ -146,16 +142,3 @@ t_to_map(_) ->
             {timestamp, emqx_message:timestamp(Msg)}],
     ?assertEqual(List, emqx_message:to_list(Msg)),
     ?assertEqual(maps:from_list(List), emqx_message:to_map(Msg)).
-    
-t_update_expiry(_) ->
-    error('TODO').
-
-t_set_header(_) ->
-    error('TODO').
-
-t_set_flag(_) ->
-    error('TODO').
-
-t_set_headers(_) ->
-    error('TODO').
-
diff --git a/test/emqx_mod_acl_internal_SUITE.erl b/test/emqx_mod_acl_internal_SUITE.erl
index 0cd9c1cd8..05b406f7a 100644
--- a/test/emqx_mod_acl_internal_SUITE.erl
+++ b/test/emqx_mod_acl_internal_SUITE.erl
@@ -29,18 +29,18 @@ init_per_testcase(_TestCase, Config) ->
 end_per_testcase(_TestCase, Config) ->
     Config.
 
-t_load(_) ->
-    error('TODO').
+% t_load(_) ->
+%     error('TODO').
 
-t_unload(_) ->
-    error('TODO').
+% t_unload(_) ->
+%     error('TODO').
 
-t_all_rules(_) ->
-    error('TODO').
+% t_all_rules(_) ->
+%     error('TODO').
 
-t_check_acl(_) ->
-    error('TODO').
+% t_check_acl(_) ->
+%     error('TODO').
 
-t_reload_acl(_) ->
-    error('TODO').
+% t_reload_acl(_) ->
+%     error('TODO').
 
diff --git a/test/emqx_mod_presence_SUITE.erl b/test/emqx_mod_presence_SUITE.erl
index a5fba303e..abc145a2d 100644
--- a/test/emqx_mod_presence_SUITE.erl
+++ b/test/emqx_mod_presence_SUITE.erl
@@ -29,16 +29,16 @@ init_per_testcase(_TestCase, Config) ->
 end_per_testcase(_TestCase, Config) ->
     Config.
 
-t_load(_) ->
-    error('TODO').
+% t_load(_) ->
+%     error('TODO').
 
-t_unload(_) ->
-    error('TODO').
+% t_unload(_) ->
+%     error('TODO').
 
-t_on_client_connected(_) ->
-    error('TODO').
+% t_on_client_connected(_) ->
+%     error('TODO').
 
-t_on_client_disconnected(_) ->
-    error('TODO').
+% t_on_client_disconnected(_) ->
+%     error('TODO').
 
 
diff --git a/test/emqx_mod_rewrite_SUITE.erl b/test/emqx_mod_rewrite_SUITE.erl
index dcc0c6a6b..7ed1cad60 100644
--- a/test/emqx_mod_rewrite_SUITE.erl
+++ b/test/emqx_mod_rewrite_SUITE.erl
@@ -29,18 +29,18 @@ init_per_testcase(_TestCase, Config) ->
 end_per_testcase(_TestCase, Config) ->
     Config.
 
-t_load(_) ->
-    error('TODO').
+% t_load(_) ->
+%     error('TODO').
 
-t_rewrite_subscribe(_) ->
-    error('TODO').
+% t_rewrite_subscribe(_) ->
+%     error('TODO').
 
-t_rewrite_unsubscribe(_) ->
-    error('TODO').
+% t_rewrite_unsubscribe(_) ->
+%     error('TODO').
 
-t_rewrite_publish(_) ->
-    error('TODO').
+% t_rewrite_publish(_) ->
+%     error('TODO').
 
-t_unload(_) ->
-    error('TODO').
+% t_unload(_) ->
+%     error('TODO').
 
diff --git a/test/emqx_mod_subscription_SUITE.erl b/test/emqx_mod_subscription_SUITE.erl
index 026bc976a..ed5acc3d6 100644
--- a/test/emqx_mod_subscription_SUITE.erl
+++ b/test/emqx_mod_subscription_SUITE.erl
@@ -29,12 +29,12 @@ init_per_testcase(_TestCase, Config) ->
 end_per_testcase(_TestCase, Config) ->
     Config.
 
-t_load(_) ->
-    error('TODO').
+% t_load(_) ->
+%     error('TODO').
 
-t_on_client_connected(_) ->
-    error('TODO').
+% t_on_client_connected(_) ->
+%     error('TODO').
 
-t_unload(_) ->
-    error('TODO').
+% t_unload(_) ->
+%     error('TODO').
 
diff --git a/test/emqx_modules_SUITE.erl b/test/emqx_modules_SUITE.erl
index 886a8d101..f4d18ddd7 100644
--- a/test/emqx_modules_SUITE.erl
+++ b/test/emqx_modules_SUITE.erl
@@ -52,12 +52,11 @@ end_per_suite(_Config) ->
 %% Test cases
 %%--------------------------------------------------------------------
 
-t_unload(_) ->
-    error('TODO').
-
-t_load(_) ->
-    error('TODO').
+% t_unload(_) ->
+%     error('TODO').
 
+% t_load(_) ->
+%     error('TODO').
 
 %% Test case for emqx_mod_presence
 t_mod_presence(_) ->
diff --git a/test/emqx_mqtt_caps_SUITE.erl b/test/emqx_mqtt_caps_SUITE.erl
index 432525bd1..40f5d44d9 100644
--- a/test/emqx_mqtt_caps_SUITE.erl
+++ b/test/emqx_mqtt_caps_SUITE.erl
@@ -24,13 +24,11 @@
 
 all() -> emqx_ct:all(?MODULE).
 
+% t_get_caps(_) ->
+%     error('TODO').
 
-t_get_caps(_) ->
-    error('TODO').
-
-t_default(_) ->
-    error('TODO').
-
+% t_default(_) ->
+%     error('TODO').
 
 t_check_pub(_) ->
     PubCaps = #{max_qos_allowed => ?QOS_1,
diff --git a/test/emqx_mqtt_props_SUITE.erl b/test/emqx_mqtt_props_SUITE.erl
index ef4876671..53ef76d4c 100644
--- a/test/emqx_mqtt_props_SUITE.erl
+++ b/test/emqx_mqtt_props_SUITE.erl
@@ -79,11 +79,11 @@ foreach_prop(Fun) ->
     lists:foreach(Fun, maps:to_list(emqx_mqtt_props:all())).
 
 
-t_all(_) ->
-    error('TODO').
+% t_all(_) ->
+%     error('TODO').
 
-t_set(_) ->
-    error('TODO').
+% t_set(_) ->
+%     error('TODO').
 
-t_get(_) ->
-    error('TODO').
\ No newline at end of file
+% t_get(_) ->
+%     error('TODO').
\ No newline at end of file
diff --git a/test/emqx_mqueue_SUITE.erl b/test/emqx_mqueue_SUITE.erl
index c33f415a8..a421b6391 100644
--- a/test/emqx_mqueue_SUITE.erl
+++ b/test/emqx_mqueue_SUITE.erl
@@ -29,23 +29,23 @@
 all() -> emqx_ct:all(?MODULE).
 
 
-t_init(_) ->
-    error('TODO').
+% t_init(_) ->
+%     error('TODO').
 
-t_is_empty(_) ->
-    error('TODO').
+% t_is_empty(_) ->
+%     error('TODO').
 
-t_len(_) ->
-    error('TODO').
+% t_len(_) ->
+%     error('TODO').
 
-t_max_len(_) ->
-    error('TODO').
+% t_max_len(_) ->
+%     error('TODO').
 
-t_dropped(_) ->
-    error('TODO').
+% t_dropped(_) ->
+%     error('TODO').
 
-t_stats(_) ->
-    error('TODO').
+% t_stats(_) ->
+%     error('TODO').
 
 t_in(_) ->
     Opts = #{max_len => 5, store_qos0 => true},
diff --git a/test/emqx_oom_SUITE.erl b/test/emqx_oom_SUITE.erl
index c7cae0c36..a44d32d2c 100644
--- a/test/emqx_oom_SUITE.erl
+++ b/test/emqx_oom_SUITE.erl
@@ -42,7 +42,6 @@ t_check(_) ->
     [self() ! {msg, I} || I <- lists:seq(1, 6)],
     ?assertEqual({shutdown, message_queue_too_long}, emqx_oom:check(Oom)).
     
-    
-t_info(_) ->
-    error('TODO').
+% t_info(_) ->
+%     error('TODO').
 
diff --git a/test/emqx_os_mon_SUITE.erl b/test/emqx_os_mon_SUITE.erl
index 63ba421f6..5f320f64b 100644
--- a/test/emqx_os_mon_SUITE.erl
+++ b/test/emqx_os_mon_SUITE.erl
@@ -29,43 +29,15 @@ init_per_suite(Config) ->
 
 end_per_suite(_Config) ->
     application:stop(os_mon).
-    
-    
-t_get_cpu_check_interval(_) ->
-    error('TODO').
 
-t_set_cpu_check_interval(_) ->
-    error('TODO').
+% t_set_mem_check_interval(_) ->
+%     error('TODO').
 
-t_get_cpu_high_watermark(_) ->
-    error('TODO').
+% t_set_sysmem_high_watermark(_) ->
+%     error('TODO').
 
-t_set_cpu_high_watermark(_) ->
-    error('TODO').
-
-t_get_cpu_low_watermark(_) ->
-    error('TODO').
-
-t_set_cpu_low_watermark(_) ->
-    error('TODO').
-
-t_get_mem_check_interval(_) ->
-    error('TODO').
-
-t_set_mem_check_interval(_) ->
-    error('TODO').
-
-t_get_sysmem_high_watermark(_) ->
-    error('TODO').
-
-t_set_sysmem_high_watermark(_) ->
-    error('TODO').
-
-t_get_procmem_high_watermark(_) ->
-    error('TODO').
-
-t_set_procmem_high_watermark(_) ->
-    error('TODO').
+% t_set_procmem_high_watermark(_) ->
+%     error('TODO').
 
 t_api(_) ->
     gen_event:swap_handler(alarm_handler, {emqx_alarm_handler, swap}, {alarm_handler, []}),
diff --git a/test/emqx_pd_SUITE.erl b/test/emqx_pd_SUITE.erl
index 5e86b42f4..7c08d7f18 100644
--- a/test/emqx_pd_SUITE.erl
+++ b/test/emqx_pd_SUITE.erl
@@ -23,12 +23,6 @@
 
 all() -> emqx_ct:all(?MODULE).
 
-t_get_counter(_) ->
-    error('TODO').
-
-t_reset_counter(_) ->
-    error('TODO').
-
 t_update_counter(_) ->
     ?assertEqual(undefined, emqx_pd:update_counter(bytes, 1)),
     ?assertEqual(1, emqx_pd:update_counter(bytes, 1)),
diff --git a/test/emqx_plugins_SUITE.erl b/test/emqx_plugins_SUITE.erl
index c4a962689..402a0887a 100644
--- a/test/emqx_plugins_SUITE.erl
+++ b/test/emqx_plugins_SUITE.erl
@@ -43,22 +43,20 @@ init_per_suite(Config) ->
 
     Config.
     
-    
-t_load_expand_plugin(_) ->
-    error('TODO').
+% t_load_expand_plugin(_) ->
+%     error('TODO').
 
-t_list(_) ->
-    error('TODO').
+% t_list(_) ->
+%     error('TODO').
 
-t_find_plugin(_) ->
-    error('TODO').
+% t_find_plugin(_) ->
+%     error('TODO').
 
-t_unload(_) ->
-    error('TODO').
+% t_unload(_) ->
+%     error('TODO').
 
-
-t_init(_) ->
-    error('TODO').
+% t_init(_) ->
+%     error('TODO').
 
 set_sepecial_cfg(_) ->
     ExpandPath = filename:dirname(code:lib_dir(emqx_mini_plugin)),
diff --git a/test/emqx_pmon_SUITE.erl b/test/emqx_pmon_SUITE.erl
index 2fcfa4be9..051c2ae6f 100644
--- a/test/emqx_pmon_SUITE.erl
+++ b/test/emqx_pmon_SUITE.erl
@@ -23,11 +23,11 @@
 
 all() -> emqx_ct:all(?MODULE).
 
-t_new(_) ->
-    error('TODO').
+% t_new(_) ->
+%     error('TODO').
 
-t_count(_) ->
-    error('TODO').
+% t_count(_) ->
+%     error('TODO').
 
 t_monitor(_) ->
     PMon = emqx_pmon:new(),
@@ -37,8 +37,8 @@ t_monitor(_) ->
     PMon2 = emqx_pmon:demonitor(self(), PMon2),
     ?assertEqual(0, emqx_pmon:count(PMon2)).
 
-t_demonitor(_) ->
-    error('TODO').
+% t_demonitor(_) ->
+%     error('TODO').
 
 t_find(_) ->
     PMon = emqx_pmon:new(),
@@ -60,5 +60,5 @@ t_erase(_) ->
     ?assertEqual([{self(), val}], Items),
     ?assertEqual(0, emqx_pmon:count(PMon3)).
 
-t_erase_all(_) ->
-    error('TODO').
+% t_erase_all(_) ->
+%     error('TODO').
diff --git a/test/emqx_pool_SUITE.erl b/test/emqx_pool_SUITE.erl
index 06d0f2917..f9c481ac1 100644
--- a/test/emqx_pool_SUITE.erl
+++ b/test/emqx_pool_SUITE.erl
@@ -86,6 +86,5 @@ t_unexpected(_) ->
 test_mfa() ->
     lists:foldl(fun(X, Sum) -> X + Sum end, 0, [1,2,3,4,5]).
 
-
-t_async_submit(_) ->
-    error('TODO').
+% t_async_submit(_) ->
+%     error('TODO').
diff --git a/test/emqx_reason_codes_SUITE.erl b/test/emqx_reason_codes_SUITE.erl
index b2db5fe42..2d50258ed 100644
--- a/test/emqx_reason_codes_SUITE.erl
+++ b/test/emqx_reason_codes_SUITE.erl
@@ -25,24 +25,23 @@
 
 all() -> emqx_ct:all(?MODULE).
 
+% t_name(_) ->
+%     error('TODO').
 
-t_name(_) ->
-    error('TODO').
+% t_text(_) ->
+%     error('TODO').
 
-t_text(_) ->
-    error('TODO').
+% t_mqtt_frame_error(_) ->
+%     error('TODO').
 
-t_mqtt_frame_error(_) ->
-    error('TODO').
+% t_connack_error(_) ->
+%     error('TODO').
 
-t_connack_error(_) ->
-    error('TODO').
+% t_compat(_) ->
+%     error('TODO').
 
-t_compat(_) ->
-    error('TODO').
-
-t_formalized(_) ->
-    error('TODO').
+% t_formalized(_) ->
+%     error('TODO').
 
 t_prop_name_text(_) ->
     ?assert(proper:quickcheck(prop_name_text(), prop_name_text(opts))).
diff --git a/test/emqx_router_SUITE.erl b/test/emqx_router_SUITE.erl
index 46d669d9c..9e4cbb240 100644
--- a/test/emqx_router_SUITE.erl
+++ b/test/emqx_router_SUITE.erl
@@ -45,23 +45,23 @@ t_mnesia(_) ->
     %% for coverage
     ok = emqx_router:mnesia(copy).
 
-t_add_route(_) ->
-    error('TODO').
+% t_add_route(_) ->
+%     error('TODO').
 
-t_do_add_route(_) ->
-    error('TODO').
+% t_do_add_route(_) ->
+%     error('TODO').
 
-t_lookup_routes(_) ->
-    error('TODO').
+% t_lookup_routes(_) ->
+%     error('TODO').
 
-t_delete_route(_) ->
-    error('TODO').
+% t_delete_route(_) ->
+%     error('TODO').
 
-t_do_delete_route(_) ->
-    error('TODO').
+% t_do_delete_route(_) ->
+%     error('TODO').
 
-t_topics(_) ->
-    error('TODO').
+% t_topics(_) ->
+%     error('TODO').
 
 t_add_delete(_) ->
     ?R:add_route(<<"a/b/c">>),
diff --git a/test/emqx_router_helper_SUITE.erl b/test/emqx_router_helper_SUITE.erl
index dbf13565b..55bb6c5d7 100644
--- a/test/emqx_router_helper_SUITE.erl
+++ b/test/emqx_router_helper_SUITE.erl
@@ -29,13 +29,12 @@ init_per_testcase(_TestCase, Config) ->
 end_per_testcase(_TestCase, Config) ->
     Config.
 
-t_mnesia(_) ->
-    error('TODO').
+% t_mnesia(_) ->
+%     error('TODO').
 
+% t_monitor(_) ->
+%     error('TODO').
 
-t_monitor(_) ->
-    error('TODO').
-
-t_stats_fun(_) ->
-    error('TODO').
+% t_stats_fun(_) ->
+%     error('TODO').
 
diff --git a/test/emqx_sequence_SUITE.erl b/test/emqx_sequence_SUITE.erl
index 4a6ae3463..a12837492 100644
--- a/test/emqx_sequence_SUITE.erl
+++ b/test/emqx_sequence_SUITE.erl
@@ -29,22 +29,20 @@
 
 all() -> emqx_ct:all(?MODULE).
 
+% t_currval(_) ->
+%     error('TODO').
 
-t_currval(_) ->
-    error('TODO').
+% t_delete(_) ->
+%     error('TODO').
 
-t_delete(_) ->
-    error('TODO').
+% t_create(_) ->
+%     error('TODO').
 
-t_create(_) ->
-    error('TODO').
-
-t_reclaim(_) ->
-    error('TODO').
-
-t_nextval(_) ->
-    error('TODO').
+% t_reclaim(_) ->
+%     error('TODO').
 
+% t_nextval(_) ->
+%     error('TODO').
 
 t_generate(_) ->
     ok = emqx_sequence:create(seqtab),
diff --git a/test/emqx_shared_sub_SUITE.erl b/test/emqx_shared_sub_SUITE.erl
index 07a9137b0..23b282832 100644
--- a/test/emqx_shared_sub_SUITE.erl
+++ b/test/emqx_shared_sub_SUITE.erl
@@ -39,20 +39,20 @@ init_per_suite(Config) ->
 end_per_suite(_Config) ->
     emqx_ct_helpers:stop_apps([]).
     
-    t_is_ack_required(_) ->
-    error('TODO').
+% t_is_ack_required(_) ->
+%     error('TODO').
 
-t_maybe_nack_dropped(_) ->
-    error('TODO').
+% t_maybe_nack_dropped(_) ->
+%     error('TODO').
 
-t_nack_no_connection(_) ->
-    error('TODO').
+% t_nack_no_connection(_) ->
+%     error('TODO').
 
-t_maybe_ack(_) ->
-    error('TODO').
+% t_maybe_ack(_) ->
+%     error('TODO').
 
-t_subscribers(_) ->
-    error('TODO').
+% t_subscribers(_) ->
+%     error('TODO').
 
 t_random_basic(_) ->
     ok = ensure_config(random),
@@ -239,15 +239,14 @@ last_message(ExpectedPayload, Pids) ->
         <<"not yet?">>
     end.
     
-t_dispatch(_) ->
-    error('TODO').
+% t_dispatch(_) ->
+%     error('TODO').
 
-t_unsubscribe(_) ->
-    error('TODO').
-
-t_subscribe(_) ->
-    error('TODO').
+% t_unsubscribe(_) ->
+%     error('TODO').
 
+% t_subscribe(_) ->
+%     error('TODO').
 
 %%--------------------------------------------------------------------
 %% help functions
diff --git a/test/emqx_sys_SUITE.erl b/test/emqx_sys_SUITE.erl
index d9942fc07..ff8645936 100644
--- a/test/emqx_sys_SUITE.erl
+++ b/test/emqx_sys_SUITE.erl
@@ -43,27 +43,26 @@ end_per_suite(_Config) ->
     ok = emqx_logger:set_log_level(error),
     ok.
     
-    t_version(_) ->
-    error('TODO').
+% t_version(_) ->
+%     error('TODO').
 
-t_sysdescr(_) ->
-    error('TODO').
+% t_sysdescr(_) ->
+%     error('TODO').
 
-t_uptime(_) ->
-    error('TODO').
+% t_uptime(_) ->
+%     error('TODO').
 
-t_datetime(_) ->
-    error('TODO').
+% t_datetime(_) ->
+%     error('TODO').
 
-t_sys_interval(_) ->
-    error('TODO').
+% t_sys_interval(_) ->
+%     error('TODO').
 
-t_sys_heatbeat_interval(_) ->
-    error('TODO').
-
-t_info(_) ->
-    error('TODO').
+% t_sys_heatbeat_interval(_) ->
+%     error('TODO').
 
+% t_info(_) ->
+%     error('TODO').
 
 t_prop_sys(_) ->
     Opts = [{numtests, 100}, {to_file, user}],