diff --git a/mysql/resource_grant.go b/mysql/resource_grant.go
index 6e4f4254..d928131b 100644
--- a/mysql/resource_grant.go
+++ b/mysql/resource_grant.go
@@ -293,7 +293,7 @@ func (t *RoleGrant) GrantOption() bool {
 }
 
 func (t *RoleGrant) SQLGrantStatement() string {
-	stmtSql := fmt.Sprintf("GRANT %s TO %s", strings.Join(t.Roles, ", "), t.UserOrRole.SQLString())
+	stmtSql := fmt.Sprintf("GRANT '%s' TO %s", strings.Join(t.Roles, "', '"), t.UserOrRole.SQLString())
 	if t.TLSOption != "" && strings.ToLower(t.TLSOption) != "none" {
 		stmtSql += fmt.Sprintf(" REQUIRE %s", t.TLSOption)
 	}
@@ -304,7 +304,7 @@ func (t *RoleGrant) SQLGrantStatement() string {
 }
 
 func (t *RoleGrant) SQLRevokeStatement() string {
-	return fmt.Sprintf("REVOKE %s FROM %s", strings.Join(t.Roles, ", "), t.UserOrRole.SQLString())
+	return fmt.Sprintf("REVOKE '%s' FROM %s", strings.Join(t.Roles, "', '"), t.UserOrRole.SQLString())
 }
 
 func (t *RoleGrant) GetRoles() []string {
diff --git a/mysql/resource_grant_test.go b/mysql/resource_grant_test.go
index 7dab0322..da9b0315 100644
--- a/mysql/resource_grant_test.go
+++ b/mysql/resource_grant_test.go
@@ -326,7 +326,7 @@ func TestAccGrantComplexMySQL8(t *testing.T) {
 
 func TestAccGrant_role(t *testing.T) {
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
-	roleName := fmt.Sprintf("TFRole%d", rand.Intn(100))
+	roleName := fmt.Sprintf("TFRole-exp%d", rand.Intn(100))
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)
@@ -361,7 +361,7 @@ func TestAccGrant_role(t *testing.T) {
 
 func TestAccGrant_roleToUser(t *testing.T) {
 	dbName := fmt.Sprintf("tf-test-%d", rand.Intn(100))
-	roleName := fmt.Sprintf("TFRole%d", rand.Intn(100))
+	roleName := fmt.Sprintf("TFRole-%d", rand.Intn(100))
 	resource.Test(t, resource.TestCase{
 		PreCheck: func() {
 			testAccPreCheck(t)