diff --git a/builtin/providers/aws/resource_aws_kms_alias.go b/builtin/providers/aws/resource_aws_kms_alias.go
index 98078f698..c0e9bfd3c 100644
--- a/builtin/providers/aws/resource_aws_kms_alias.go
+++ b/builtin/providers/aws/resource_aws_kms_alias.go
@@ -31,7 +31,7 @@ func resourceAwsKmsAlias() *schema.Resource {
 					value := v.(string)
 					if !regexp.MustCompile(`^(alias\/)[a-zA-Z0-9:/_-]+$`).MatchString(value) {
 						es = append(es, fmt.Errorf(
-							"name must begin with 'alias/' and be comprised of only [a-zA-Z0-9:/_-]", k))
+							"%q must begin with 'alias/' and be comprised of only [a-zA-Z0-9:/_-]", k))
 					}
 					return
 				},
diff --git a/builtin/providers/aws/resource_aws_kms_key.go b/builtin/providers/aws/resource_aws_kms_key.go
index 2b3261df9..03829b5fe 100644
--- a/builtin/providers/aws/resource_aws_kms_key.go
+++ b/builtin/providers/aws/resource_aws_kms_key.go
@@ -40,7 +40,7 @@ func resourceAwsKmsKey() *schema.Resource {
 					value := v.(string)
 					if !(value == "ENCRYPT_DECRYPT" || value == "") {
 						es = append(es, fmt.Errorf(
-							"key_usage must be ENCRYPT_DECRYPT or not specified"))
+							"%q must be ENCRYPT_DECRYPT or not specified", k))
 					}
 					return
 				},
@@ -57,7 +57,7 @@ func resourceAwsKmsKey() *schema.Resource {
 					value := v.(int)
 					if value > 30 || value < 7 {
 						es = append(es, fmt.Errorf(
-							"deletion window must be between 7 and 30 days inclusive"))
+							"%q must be between 7 and 30 days inclusive", k))
 					}
 					return
 				},