diff --git a/go/mysql/auth_server.go b/go/mysql/auth_server.go
index 91cb6a6489b..83d0c5e04f8 100644
--- a/go/mysql/auth_server.go
+++ b/go/mysql/auth_server.go
@@ -160,7 +160,7 @@ func isPassScrambleMysqlNativePassword(reply, salt []byte, mysqlNativePassword s
 		return false
 	}
 
-	if strings.Index(mysqlNativePassword, "*") != -1 {
+	if strings.Contains(mysqlNativePassword, "*") {
 		mysqlNativePassword = mysqlNativePassword[1:]
 	}
 
diff --git a/go/mysql/flavor.go b/go/mysql/flavor.go
index aa589e838de..69cf7434b9f 100644
--- a/go/mysql/flavor.go
+++ b/go/mysql/flavor.go
@@ -109,7 +109,7 @@ func (c *Conn) fillFlavor() {
 		return
 	}
 
-	if strings.Index(c.ServerVersion, mariaDBVersionString) != -1 {
+	if strings.Contains(c.ServerVersion, mariaDBVersionString) {
 		c.flavor = mariadbFlavor{}
 		return
 	}