diff --git a/test/emqttd_SUITE.erl b/test/emqttd_SUITE.erl
index f59c8968b..3b1833cb2 100644
--- a/test/emqttd_SUITE.erl
+++ b/test/emqttd_SUITE.erl
@@ -45,7 +45,6 @@ all() ->
      {group, stats},
      {group, hook},
      {group, http},
-     {group, cluster},
      {group, alarms},
      {group, cli},
      {group, cleanSession}].
@@ -81,14 +80,6 @@ groups() ->
       request_publish
      % websocket_test
      ]},
-    {cluster, [sequence],
-     [cluster_test,
-      cluster_join,
-      cluster_leave,
-      cluster_remove,
-      cluster_remove2,
-      cluster_node_down
-     ]},
      {alarms, [sequence], 
      [set_alarms]
      },
@@ -469,79 +460,6 @@ websocket_test(_) ->
 
     ct:log("Req:~p", [Req]),
     emqttd_http:handle_request(Req).
-%%--------------------------------------------------------------------
-%% cluster group
-%%--------------------------------------------------------------------
-cluster_test(_Config) ->
-    Z = slave(emqttd, cluster_test_z),
-    wait_running(Z),
-    true = emqttd:is_running(Z),
-    Node = node(),
-    ok = rpc:call(Z, emqttd_cluster, join, [Node]),
-    [Z, Node] = lists:sort(mnesia:system_info(running_db_nodes)),
-    ct:log("Z:~p, Node:~p", [Z, Node]),
-    ok = rpc:call(Z, emqttd_cluster, leave, []),
-    [Node] = lists:sort(mnesia:system_info(running_db_nodes)),
-    ok = slave:stop(Z).
-
-cluster_join(_) ->
-    Z = slave(emqttd, cluster_join_z),
-    N = slave(node, cluster_join_n),
-    wait_running(Z),
-    true = emqttd:is_running(Z),
-    Node = node(),
-    {error, {cannot_join_with_self, Node}} = emqttd_cluster:join(Node),
-    {error, {node_not_running, N}} = emqttd_cluster:join(N),
-    ok = emqttd_cluster:join(Z),
-    slave:stop(Z),
-    slave:stop(N).
- 
-cluster_leave(_) ->
-    Z = slave(emqttd, cluster_leave_z),
-    wait_running(Z),
-    {error, node_not_in_cluster} = emqttd_cluster:leave(),
-    ok = emqttd_cluster:join(Z),
-    Node = node(),
-    [Z, Node] = emqttd_mnesia:running_nodes(),
-    ok = emqttd_cluster:leave(),
-    [Node] = emqttd_mnesia:running_nodes(),
-    slave:stop(Z).
-
-cluster_remove(_) ->
-    Z = slave(emqttd, cluster_remove_z),
-    wait_running(Z),
-    Node = node(),
-    {error, {cannot_remove_self, Node}} = emqttd_cluster:remove(Node),
-    ok = emqttd_cluster:join(Z),
-    [Z, Node] = emqttd_mnesia:running_nodes(),
-    ok = emqttd_cluster:remove(Z),
-    [Node] = emqttd_mnesia:running_nodes(),
-    slave:stop(Z).
-
-cluster_remove2(_) ->
-    Z = slave(emqttd, cluster_remove2_z),
-    wait_running(Z),
-    ok = emqttd_cluster:join(Z),
-    Node = node(),
-    [Z, Node] = emqttd_mnesia:running_nodes(),
-    ok = emqttd_cluster:remove(Z),
-    ok = rpc:call(Z, emqttd_mnesia, ensure_stopped, []),
-    [Node] = emqttd_mnesia:running_nodes(),
-    slave:stop(Z).
-
-cluster_node_down(_) ->
-    Z = slave(emqttd, cluster_node_down),
-    timer:sleep(1000),
-    wait_running(Z),
-    ok = emqttd_cluster:join(Z),
-    ok = rpc:call(Z, emqttd_router, add_route, [<<"a/b/c">>]),
-    ok = rpc:call(Z, emqttd_router, add_route, [<<"#">>]),
-    Routes = lists:sort(emqttd_router:match(<<"a/b/c">>)),
-    ct:log("Routes: ~p~n", [Routes]),
-    [<<"#">>, <<"a/b/c">>] = [Topic || #mqtt_route{topic = Topic} <- Routes],
-    slave:stop(Z),
-    timer:sleep(1000),
-    [] = lists:sort(emqttd_router:match(<<"a/b/c">>)).
 
 set_alarms(_) ->
     AlarmTest = #mqtt_alarm{id = <<"1">>, severity = error, title="alarm title", summary="alarm summary"},
@@ -551,8 +469,6 @@ set_alarms(_) ->
     emqttd_alarm:clear_alarm(<<"1">>),
     [] = emqttd_alarm:get_alarms().
 
-
-
 %%--------------------------------------------------------------------
 %% Cli group
 %%--------------------------------------------------------------------
@@ -705,34 +621,6 @@ cleanSession_validate1(_) ->
     emqttc:disconnect(Pub),
     emqttc:disconnect(C11).
 
-
-ensure_ok(ok) -> ok;
-ensure_ok({error, {already_started, _}}) -> ok.
-
-host() -> [_, Host] = string:tokens(atom_to_list(node()), "@"), Host.
-
-wait_running(Node) ->
-    wait_running(Node, 30000).
-
-wait_running(Node, Timeout) when Timeout < 0 ->
-    throw({wait_timeout, Node});
-
-wait_running(Node, Timeout) ->
-    case rpc:call(Node, emqttd, is_running, [Node]) of
-        true  -> ok;
-        false -> timer:sleep(100),
-                 wait_running(Node, Timeout - 100)
-    end.
-
-slave(emqttd, Node) ->
-    {ok, Emq} = slave:start(host(), Node, "-pa ../../ebin -pa ../../deps/*/ebin"),
-    rpc:call(Emq, application, ensure_all_started, [emqttd]),
-    Emq;
-
-slave(node, Node) ->
-    {ok, N} = slave:start(host(), Node, "-pa ../../ebin -pa ../../deps/*/ebin"),
-    N.
-
 emqttd_config(DataDir) ->
     Schema = cuttlefish_schema:files([filename:join([DataDir, "emqttd.schema"])]),
     Conf = conf_parse:file(filename:join([DataDir, "emqttd.conf"])),