diff --git a/test/emqx_alarm_handler_SUITE.erl b/test/emqx_alarm_handler_SUITE.erl
index 3e818f007..e7e8139b9 100644
--- a/test/emqx_alarm_handler_SUITE.erl
+++ b/test/emqx_alarm_handler_SUITE.erl
@@ -82,8 +82,18 @@ t_alarm_handler(_) ->
 
             {ok, ?PUBLISH_PACKET(?QOS_0, Topic2, _, _), <<>>, _} = raw_recv_parse(Data4),
 
-            ?assertEqual(false, lists:keymember(alarm_for_test, 1, emqx_alarm_handler:get_alarms()))
+            ?assertEqual(false, lists:keymember(alarm_for_test, 1, emqx_alarm_handler:get_alarms())),
 
+            emqx_alarm_handler:mnesia(copy),
+            ?assertEqual(true, lists:keymember(alarm_for_test, 1, emqx_alarm_handler:get_alarms(history))),
+
+            alarm_handler:clear_alarm(not_exist),
+
+            gen_event:start({local, alarm_handler_2}, []),
+            gen_event:add_handler(alarm_handler_2, emqx_alarm_handler, []),
+            ?assertEqual({error,bad_query}, gen_event:call(alarm_handler_2, emqx_alarm_handler, bad_query)),
+            ?assertEqual(ok, gen_event:notify(alarm_handler_2, ignored)),
+            gen_event:stop(alarm_handler_2)
         end).
 
 with_connection(DoFun) ->
diff --git a/test/emqx_stats_SUITE.erl b/test/emqx_stats_SUITE.erl
index c419366c3..467c21e7b 100644
--- a/test/emqx_stats_SUITE.erl
+++ b/test/emqx_stats_SUITE.erl
@@ -34,18 +34,6 @@ t_get_error_state(_) ->
     Conns = emqx_stats:getstats(),
     ?assertEqual([], Conns).
 
-t_statsfun(_) ->
-    error('TODO').
-
-t_getstats(_) ->
-    error('TODO').
-
-t_getstat(_) ->
-    error('TODO').
-
-t_setstat(_) ->
-    error('TODO').
-
 t_get_state(_) ->
     with_proc(fun() ->
         ?assertEqual(undefined, emqx_stats:getstat('notExist')),
diff --git a/test/emqx_topic_SUITE.erl b/test/emqx_topic_SUITE.erl
index 7eb803895..8dd2c5ca0 100644
--- a/test/emqx_topic_SUITE.erl
+++ b/test/emqx_topic_SUITE.erl
@@ -229,7 +229,3 @@ bench(Case, Fun, Args) ->
                           ]),
     ct:pal("Time consumed by ~s: ~.3f(us)~nCall ~s per second: ~w",
            [Case, Time/?N, Case, (?N * 1000000) div Time]).
-
-
-t_match(_) ->
-    error('TODO').