diff --git a/apps/emqx/test/emqx_cth_suite.erl b/apps/emqx/test/emqx_cth_suite.erl
index 5fe4dce66..75c54400b 100644
--- a/apps/emqx/test/emqx_cth_suite.erl
+++ b/apps/emqx/test/emqx_cth_suite.erl
@@ -519,3 +519,14 @@ upgrade_raw_conf(Conf) ->
         ce ->
             emqx_conf_schema:upgrade_raw_conf(Conf)
     end.
+
+skip_if_oss() ->
+    try emqx_release:edition() of
+        ee ->
+            false;
+        _ ->
+            {skip, not_supported_in_oss}
+    catch
+        error:undef ->
+            {skip, standalone_not_supported}
+    end.
diff --git a/apps/emqx_management/test/emqx_mgmt_cli_SUITE.erl b/apps/emqx_management/test/emqx_mgmt_cli_SUITE.erl
index cb3451fc1..f85fdbe5b 100644
--- a/apps/emqx_management/test/emqx_mgmt_cli_SUITE.erl
+++ b/apps/emqx_management/test/emqx_mgmt_cli_SUITE.erl
@@ -22,7 +22,13 @@
 -include_lib("common_test/include/ct.hrl").
 
 all() ->
-    emqx_common_test_helpers:all(?MODULE).
+    All = emqx_common_test_helpers:all(?MODULE),
+    case emqx_cth_suite:skip_if_oss() of
+        false ->
+            All;
+        _ ->
+            All -- [t_autocluster_leave]
+    end.
 
 init_per_suite(Config) ->
     Apps = emqx_cth_suite:start(
diff --git a/rel/config/examples/node.conf.example b/rel/config/examples/node.conf.example
index 596e9884d..f4fd3288e 100644
--- a/rel/config/examples/node.conf.example
+++ b/rel/config/examples/node.conf.example
@@ -11,11 +11,11 @@ node {
     ## Secret cookie is a random string that should be the same on all nodes in the cluster, but unique per EMQX cluster
     cookie = "Yzc0NGExM2Rj"
 
-    ## Select a node role
+    ## Select a node role (Enterprise Edition feature)
     ## Possible values:
     ##   - core: This is a core node which provides durability of the client states, and takes care of writes
     ##   - replicant: This is a stateless worker node
-    role = core
+    ## role = core
 
     ## Maximum number of simultaneously existing processes for this Erlang system
     process_limit = 2097152