diff --git a/conf/scylla.yaml b/conf/scylla.yaml
index a885f3c728..202ebd4927 100644
--- a/conf/scylla.yaml
+++ b/conf/scylla.yaml
@@ -14,7 +14,7 @@
 # one logical cluster from joining another.
 # It is recommended to change the default value when creating a new cluster.
 # You can NOT modify this value for an existing cluster
-#cluster_name: 'ScyllaDB Cluster'
+#cluster_name: 'Test Cluster'
 
 # This defines the number of tokens randomly assigned to this node on the ring
 # The more tokens, relative to other nodes, the larger the proportion of data
diff --git a/main.cc b/main.cc
index eebc6150c0..83c7c10741 100644
--- a/main.cc
+++ b/main.cc
@@ -499,7 +499,7 @@ int main(int ac, char** av) {
             auto prio = get_or_default(ssl_opts, "priority_string", sstring());
             auto clauth = is_true(get_or_default(ssl_opts, "require_client_auth", "false"));
             if (cluster_name.empty()) {
-                cluster_name = "ScyllaDB Cluster";
+                cluster_name = "Test Cluster";
                 startlog.warn("Using default cluster name is not recommended. Using a unique cluster name will reduce the chance of adding nodes to the wrong cluster by mistake");
             }
             init_ms_fd_gossiper(listen_address