diff --git a/truststore.go b/truststore.go
index d70efcadf592a4e6e45e949d7cadbe75b937878a..714af038c0b39b9f3c65ff0324c011b1a7ca9d74 100644
--- a/truststore.go
+++ b/truststore.go
@@ -12,7 +12,7 @@ import (
 	"os"
 )
 
-var prefix = "Truststore Development CA "
+var prefix = ""
 var enableDebug bool
 
 func debug(format string, args ...interface{}) {
@@ -214,7 +214,14 @@ func WithPrefix(s string) Option {
 }
 
 func uniqueName(cert *x509.Certificate) string {
-	return prefix + cert.SerialNumber.String()
+	switch {
+	case prefix != "":
+		return prefix + cert.SerialNumber.String()
+	case cert.Subject.CommonName != "":
+		return cert.Subject.CommonName + " " + cert.SerialNumber.String()
+	default:
+		return "Truststore Development CA " + cert.SerialNumber.String()
+	}
 }
 
 func saveTempCert(cert *x509.Certificate) (string, func(), error) {