diff --git a/builtin/providers/aws/resource_aws_route53_zone_association_test.go b/builtin/providers/aws/resource_aws_route53_zone_association_test.go
index d3031739d..8a734463d 100644
--- a/builtin/providers/aws/resource_aws_route53_zone_association_test.go
+++ b/builtin/providers/aws/resource_aws_route53_zone_association_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/awslabs/aws-sdk-go/service/route53"
 )
 
-func TestAccRoute53ZoneAssociation(t *testing.T) {
+func TestAccRoute53ZoneAssociation_basic(t *testing.T) {
 	var zone route53.HostedZone
 
 	resource.Test(t, resource.TestCase{
@@ -30,7 +30,7 @@ func TestAccRoute53ZoneAssociation(t *testing.T) {
 	})
 }
 
-func TestAccRoute53ZoneAssociationWithRegion(t *testing.T) {
+func TestAccRoute53ZoneAssociation_region(t *testing.T) {
 	var zone route53.HostedZone
 
 	// record the initialized providers so that we can use them to
diff --git a/builtin/providers/aws/resource_aws_route53_zone_test.go b/builtin/providers/aws/resource_aws_route53_zone_test.go
index 3a2d1279f..6009093d6 100644
--- a/builtin/providers/aws/resource_aws_route53_zone_test.go
+++ b/builtin/providers/aws/resource_aws_route53_zone_test.go
@@ -64,7 +64,7 @@ func TestCleanChangeID(t *testing.T) {
 	}
 }
 
-func TestAccRoute53Zone(t *testing.T) {
+func TestAccRoute53Zone_basic(t *testing.T) {
 	var zone route53.GetHostedZoneOutput
 	var td route53.ResourceTagSet
 
@@ -85,7 +85,7 @@ func TestAccRoute53Zone(t *testing.T) {
 	})
 }
 
-func TestAccRoute53PrivateZone(t *testing.T) {
+func TestAccRoute53Zone_private_basic(t *testing.T) {
 	var zone route53.GetHostedZoneOutput
 
 	resource.Test(t, resource.TestCase{
@@ -104,7 +104,7 @@ func TestAccRoute53PrivateZone(t *testing.T) {
 	})
 }
 
-func TestAccRoute53PrivateZoneWithRegion(t *testing.T) {
+func TestAccRoute53Zone_private_region(t *testing.T) {
 	var zone route53.GetHostedZoneOutput
 
 	// record the initialized providers so that we can use them to