diff --git a/pkg/cli/demo.go b/pkg/cli/demo.go
index bc7265087bed..4463f21d4f4f 100644
--- a/pkg/cli/demo.go
+++ b/pkg/cli/demo.go
@@ -350,17 +350,21 @@ func runDemo(cmd *cobra.Command, gen workload.Generator) (err error) {
 			// if embedded, the embedding platform owns the network
 			// configuration.
 			`#
-# Connection parameters:
-#`,
-			strings.ReplaceAll(strings.TrimSuffix(nodeList.String(), "\n"), "\n", "\n# "))
+# If you wish to access this demo cluster using another tool, you will need
+# the following details:
+#
+#   - Connection parameters:
+#  `,
+			strings.ReplaceAll(strings.TrimSuffix(nodeList.String(), "\n"), "\n", "\n#   "))
 
 		if !demoCtx.insecure {
-			fmt.Printf(`#
-# The user %q with password %q has been created. Use it to access the Web UI!
+			fmt.Printf(`#   - Username: %q, password: %q
+#   - Directory with certificate files (for certain SQL drivers/tools): %s
 #
 `,
 				c.adminUser,
 				c.adminPassword,
+				c.demoDir,
 			)
 		}
 
diff --git a/pkg/cli/interactive_tests/test_demo.tcl b/pkg/cli/interactive_tests/test_demo.tcl
index c18cab11bc91..2375ba1d0a37 100644
--- a/pkg/cli/interactive_tests/test_demo.tcl
+++ b/pkg/cli/interactive_tests/test_demo.tcl
@@ -78,8 +78,8 @@ start_test "Check that demo secure says hello properly"
 set ::env(COCKROACH_INSECURE) "false"
 spawn $argv demo --no-example-database
 eexpect "Welcome"
-eexpect "The user \"demo\" with password"
-eexpect "has been created."
+eexpect "Username: \"demo\", password"
+eexpect "Directory with certificate files"
 eexpect "defaultdb>"
 
 # Show the URLs.
@@ -104,8 +104,7 @@ eexpect eof
 set ::env(COCKROACH_INSECURE) "true"
 spawn $argv demo --insecure=false --no-example-database
 eexpect "Welcome"
-eexpect "The user \"demo\" with password"
-eexpect "has been created."
+eexpect "Username: \"demo\", password"
 eexpect "defaultdb>"
 
 # Show the URLs.