diff --git a/test/emqx_shared_sub_SUITE.erl b/test/emqx_shared_sub_SUITE.erl
index 30bd96a66..837ef962f 100644
--- a/test/emqx_shared_sub_SUITE.erl
+++ b/test/emqx_shared_sub_SUITE.erl
@@ -284,7 +284,7 @@ test_two_messages(Strategy, Group) ->
     ok.
 
 last_message(ExpectedPayload, Pids) ->
-    last_message(ExpectedPayload, Pids, 100).
+    last_message(ExpectedPayload, Pids, 6000).
 
 last_message(ExpectedPayload, Pids, Timeout) ->
     receive
@@ -401,10 +401,10 @@ t_local_fallback(_) ->
 
     emqtt:subscribe(ConnPid1, {<<"$share/local_group_fallback/local_foo/bar">>, 0}),
 
-    emqx:publish(Message1),
+    [{share, <<"local_foo/bar">>, {ok, 1}}] = emqx:publish(Message1),
     {true, UsedSubPid1} = last_message(<<"hello1">>, [ConnPid1]),
 
-    rpc:call(Node, emqx, publish, [Message2]),
+    [{share, <<"local_foo/bar">>, {ok, 1}}] = rpc:call(Node, emqx, publish, [Message2]),
     {true, UsedSubPid2} = last_message(<<"hello2">>, [ConnPid1]),
 
     emqtt:stop(ConnPid1),
@@ -537,7 +537,7 @@ start_slave(Name, Port) ->
                                  {erl_flags, ebin_path()}]),
 
     pong = net_adm:ping(Node),
-    setup_node(Node, Port),
+    ok = setup_node(Node, Port),
     Node.
 
 stop_slave(Node) ->
@@ -573,6 +573,6 @@ setup_node(Node, Port) ->
     [ok = rpc:call(Node, application, load, [App]) || App <- [gen_rpc, emqx]],
     ok = rpc:call(Node, emqx_ct_helpers, start_apps, [[emqx], EnvHandler]),
 
-    rpc:call(Node, ekka, join, [node()]),
-
+    ok = rpc:call(Node, ekka, join, [node()]),
+    true = lists:member(Node, nodes()),
     ok.