diff --git a/GNUmakefile b/GNUmakefile
index 551634bd830..631da392c87 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -76,6 +76,7 @@ awsproviderlint:
 		-c 1 \
 		-AT001 \
 		-AT002 \
+		-AT003 \
 		-AT005 \
 		-AT006 \
 		-AT007 \
diff --git a/aws/data_source_aws_acmpca_certificate_authority_test.go b/aws/data_source_aws_acmpca_certificate_authority_test.go
index 556e56286e2..98e8d66f43b 100644
--- a/aws/data_source_aws_acmpca_certificate_authority_test.go
+++ b/aws/data_source_aws_acmpca_certificate_authority_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsAcmpcaCertificateAuthority_Basic(t *testing.T) {
+func TestAccDataSourceAwsAcmpcaCertificateAuthority_basic(t *testing.T) {
 	resourceName := "aws_acmpca_certificate_authority.test"
 	datasourceName := "data.aws_acmpca_certificate_authority.test"
 
diff --git a/aws/data_source_aws_api_gateway_api_key_test.go b/aws/data_source_aws_api_gateway_api_key_test.go
index 4f10d332f48..652f4430c25 100644
--- a/aws/data_source_aws_api_gateway_api_key_test.go
+++ b/aws/data_source_aws_api_gateway_api_key_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsApiGatewayApiKey(t *testing.T) {
+func TestAccDataSourceAwsApiGatewayApiKey_basic(t *testing.T) {
 	rName := acctest.RandString(8)
 	resourceName1 := "aws_api_gateway_api_key.example_key"
 	dataSourceName1 := "data.aws_api_gateway_api_key.test_key"
diff --git a/aws/data_source_aws_api_gateway_resource_test.go b/aws/data_source_aws_api_gateway_resource_test.go
index b092c55566f..4414ab99553 100644
--- a/aws/data_source_aws_api_gateway_resource_test.go
+++ b/aws/data_source_aws_api_gateway_resource_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsApiGatewayResource(t *testing.T) {
+func TestAccDataSourceAwsApiGatewayResource_basic(t *testing.T) {
 	rName := acctest.RandString(8)
 	resourceName1 := "aws_api_gateway_resource.example_v1"
 	dataSourceName1 := "data.aws_api_gateway_resource.example_v1"
diff --git a/aws/data_source_aws_api_gateway_vpc_link_test.go b/aws/data_source_aws_api_gateway_vpc_link_test.go
index c0f7e4f1b5d..c8758b55544 100644
--- a/aws/data_source_aws_api_gateway_vpc_link_test.go
+++ b/aws/data_source_aws_api_gateway_vpc_link_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsApiGatewayVpcLink(t *testing.T) {
+func TestAccDataSourceAwsApiGatewayVpcLink_basic(t *testing.T) {
 	rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(8))
 	resourceName := "aws_api_gateway_vpc_link.vpc_link"
 	dataSourceName := "data.aws_api_gateway_vpc_link.vpc_link"
diff --git a/aws/data_source_aws_batch_compute_environment_test.go b/aws/data_source_aws_batch_compute_environment_test.go
index 9cc335594ab..08d02eca0b3 100644
--- a/aws/data_source_aws_batch_compute_environment_test.go
+++ b/aws/data_source_aws_batch_compute_environment_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccDataSourceAwsBatchComputeEnvironment(t *testing.T) {
+func TestAccDataSourceAwsBatchComputeEnvironment_basic(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf_acc_test_")
 	resourceName := "aws_batch_compute_environment.test"
 	datasourceName := "data.aws_batch_compute_environment.by_name"
diff --git a/aws/data_source_aws_batch_job_queue_test.go b/aws/data_source_aws_batch_job_queue_test.go
index 4dc24a540e9..cf70207201a 100644
--- a/aws/data_source_aws_batch_job_queue_test.go
+++ b/aws/data_source_aws_batch_job_queue_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccDataSourceAwsBatchJobQueue(t *testing.T) {
+func TestAccDataSourceAwsBatchJobQueue_basic(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf_acc_test_")
 	resourceName := "aws_batch_job_queue.test"
 	datasourceName := "data.aws_batch_job_queue.by_name"
diff --git a/aws/data_source_aws_dx_gateway_test.go b/aws/data_source_aws_dx_gateway_test.go
index f20cb9e7e45..ec8695cc66c 100644
--- a/aws/data_source_aws_dx_gateway_test.go
+++ b/aws/data_source_aws_dx_gateway_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsDxGateway_Basic(t *testing.T) {
+func TestAccDataSourceAwsDxGateway_basic(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_dx_gateway.test"
 	datasourceName := "data.aws_dx_gateway.test"
diff --git a/aws/data_source_aws_ebs_volumes_test.go b/aws/data_source_aws_ebs_volumes_test.go
index 9dc9a995213..a2865a5d00d 100644
--- a/aws/data_source_aws_ebs_volumes_test.go
+++ b/aws/data_source_aws_ebs_volumes_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsEbsVolumes(t *testing.T) {
+func TestAccDataSourceAwsEbsVolumes_basic(t *testing.T) {
 	rInt := acctest.RandIntRange(0, 256)
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
diff --git a/aws/data_source_aws_efs_mount_target_test.go b/aws/data_source_aws_efs_mount_target_test.go
index 9a48cd410a7..8508794846b 100644
--- a/aws/data_source_aws_efs_mount_target_test.go
+++ b/aws/data_source_aws_efs_mount_target_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsEfsMountTargetByMountTargetId(t *testing.T) {
+func TestAccDataSourceAwsEfsMountTarget_basic(t *testing.T) {
 	rName := acctest.RandString(10)
 	dataSourceName := "data.aws_efs_mount_target.test"
 	resourceName := "aws_efs_mount_target.test"
diff --git a/aws/data_source_aws_elastic_beanstalk_solution_stack_test.go b/aws/data_source_aws_elastic_beanstalk_solution_stack_test.go
index 0cf12973c0b..f65f6a51304 100644
--- a/aws/data_source_aws_elastic_beanstalk_solution_stack_test.go
+++ b/aws/data_source_aws_elastic_beanstalk_solution_stack_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSElasticBeanstalkSolutionStackDataSource(t *testing.T) {
+func TestAccAWSElasticBeanstalkSolutionStackDataSource_basic(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
diff --git a/aws/data_source_aws_kinesis_stream_test.go b/aws/data_source_aws_kinesis_stream_test.go
index a4f6524e665..a557dffea74 100644
--- a/aws/data_source_aws_kinesis_stream_test.go
+++ b/aws/data_source_aws_kinesis_stream_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccAWSKinesisStreamDataSource(t *testing.T) {
+func TestAccAWSKinesisStreamDataSource_basic(t *testing.T) {
 	var stream kinesis.StreamDescription
 
 	sn := fmt.Sprintf("terraform-kinesis-test-%d", acctest.RandInt())
diff --git a/aws/data_source_aws_lb_target_group_test.go b/aws/data_source_aws_lb_target_group_test.go
index 742427d080a..58f84e09cf8 100644
--- a/aws/data_source_aws_lb_target_group_test.go
+++ b/aws/data_source_aws_lb_target_group_test.go
@@ -68,7 +68,7 @@ func TestAccDataSourceAWSALBTargetGroup_basic(t *testing.T) {
 	})
 }
 
-func TestAccDataSourceAWSLBTargetGroupBackwardsCompatibility(t *testing.T) {
+func TestAccDataSourceAWSLBTargetGroup_BackwardsCompatibility(t *testing.T) {
 	lbName := fmt.Sprintf("testlb-%s", acctest.RandStringFromCharSet(13, acctest.CharSetAlphaNum))
 	targetGroupName := fmt.Sprintf("testtargetgroup-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
 	resourceNameArn := "data.aws_alb_target_group.alb_tg_test_with_arn"
diff --git a/aws/data_source_aws_lb_test.go b/aws/data_source_aws_lb_test.go
index 0e9cea0fbb8..94d343c6afc 100644
--- a/aws/data_source_aws_lb_test.go
+++ b/aws/data_source_aws_lb_test.go
@@ -52,7 +52,7 @@ func TestAccDataSourceAWSLB_basic(t *testing.T) {
 	})
 }
 
-func TestAccDataSourceAWSLBBackwardsCompatibility(t *testing.T) {
+func TestAccDataSourceAWSLB_BackwardsCompatibility(t *testing.T) {
 	lbName := fmt.Sprintf("testaccawsalb-basic-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
 	dataSourceName1 := "data.aws_alb.alb_test_with_arn"
 	dataSourceName2 := "data.aws_alb.alb_test_with_name"
diff --git a/aws/data_source_aws_nat_gateway_test.go b/aws/data_source_aws_nat_gateway_test.go
index d98e1c74b62..f98a1055988 100644
--- a/aws/data_source_aws_nat_gateway_test.go
+++ b/aws/data_source_aws_nat_gateway_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsNatGateway(t *testing.T) {
+func TestAccDataSourceAwsNatGateway_basic(t *testing.T) {
 	// This is used as a portion of CIDR network addresses.
 	rInt := acctest.RandIntRange(4, 254)
 
diff --git a/aws/data_source_aws_qldb_ledger_test.go b/aws/data_source_aws_qldb_ledger_test.go
index f35e303d780..09b1564260a 100644
--- a/aws/data_source_aws_qldb_ledger_test.go
+++ b/aws/data_source_aws_qldb_ledger_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsQLDBLedger(t *testing.T) {
+func TestAccDataSourceAwsQLDBLedger_basic(t *testing.T) {
 	rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(7)) // QLDB name cannot be longer than 32 characters
 
 	resource.ParallelTest(t, resource.TestCase{
diff --git a/aws/data_source_aws_ram_resource_share_test.go b/aws/data_source_aws_ram_resource_share_test.go
index 434b50baada..6a3a25ee6bc 100644
--- a/aws/data_source_aws_ram_resource_share_test.go
+++ b/aws/data_source_aws_ram_resource_share_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsRamResourceShare_Basic(t *testing.T) {
+func TestAccDataSourceAwsRamResourceShare_basic(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_ram_resource_share.test"
 	datasourceName := "data.aws_ram_resource_share.test"
diff --git a/aws/data_source_aws_regions_test.go b/aws/data_source_aws_regions_test.go
index b8e523ff046..6871fd01f04 100644
--- a/aws/data_source_aws_regions_test.go
+++ b/aws/data_source_aws_regions_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccDataSourceAwsRegions_Basic(t *testing.T) {
+func TestAccDataSourceAwsRegions_basic(t *testing.T) {
 	resourceName := "data.aws_regions.empty"
 
 	resource.ParallelTest(t, resource.TestCase{
diff --git a/aws/data_source_aws_route_tables_test.go b/aws/data_source_aws_route_tables_test.go
index ce1c0b20fbe..68806209f61 100644
--- a/aws/data_source_aws_route_tables_test.go
+++ b/aws/data_source_aws_route_tables_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsRouteTables(t *testing.T) {
+func TestAccDataSourceAwsRouteTables_basic(t *testing.T) {
 	rInt := acctest.RandIntRange(0, 256)
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
diff --git a/aws/data_source_aws_secretsmanager_secret_rotation_test.go b/aws/data_source_aws_secretsmanager_secret_rotation_test.go
index 79559af7011..f78d5f7a6e8 100644
--- a/aws/data_source_aws_secretsmanager_secret_rotation_test.go
+++ b/aws/data_source_aws_secretsmanager_secret_rotation_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsSecretsManagerSecretRotation_Basic(t *testing.T) {
+func TestAccDataSourceAwsSecretsManagerSecretRotation_basic(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_secretsmanager_secret_rotation.test"
 	datasourceName := "data.aws_secretsmanager_secret_rotation.test"
diff --git a/aws/data_source_aws_secretsmanager_secret_test.go b/aws/data_source_aws_secretsmanager_secret_test.go
index 08429abf4c3..d9989d25a0f 100644
--- a/aws/data_source_aws_secretsmanager_secret_test.go
+++ b/aws/data_source_aws_secretsmanager_secret_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccDataSourceAwsSecretsManagerSecret_Basic(t *testing.T) {
+func TestAccDataSourceAwsSecretsManagerSecret_basic(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t); testAccPreCheckAWSSecretsManager(t) },
 		Providers: testAccProviders,
diff --git a/aws/data_source_aws_secretsmanager_secret_version_test.go b/aws/data_source_aws_secretsmanager_secret_version_test.go
index 5255ac1ca16..bee026ba98f 100644
--- a/aws/data_source_aws_secretsmanager_secret_version_test.go
+++ b/aws/data_source_aws_secretsmanager_secret_version_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccDataSourceAwsSecretsManagerSecretVersion_Basic(t *testing.T) {
+func TestAccDataSourceAwsSecretsManagerSecretVersion_basic(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_secretsmanager_secret_version.test"
 	datasourceName := "data.aws_secretsmanager_secret_version.test"
diff --git a/aws/data_source_aws_sfn_activity_test.go b/aws/data_source_aws_sfn_activity_test.go
index 5c7bf2174b2..9de84fda2bb 100644
--- a/aws/data_source_aws_sfn_activity_test.go
+++ b/aws/data_source_aws_sfn_activity_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccAWSStepFunctionsActivityDataSource(t *testing.T) {
+func TestAccAWSStepFunctionsActivityDataSource_basic(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_sfn_activity.test"
 	dataName := "data.aws_sfn_activity.test"
diff --git a/aws/data_source_aws_sfn_state_machine_test.go b/aws/data_source_aws_sfn_state_machine_test.go
index 1a423030b37..ee7612d7e78 100644
--- a/aws/data_source_aws_sfn_state_machine_test.go
+++ b/aws/data_source_aws_sfn_state_machine_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsSfnStateMachine(t *testing.T) {
+func TestAccDataSourceAwsSfnStateMachine_basic(t *testing.T) {
 	rName := acctest.RandString(5)
 	dataSourceName := "data.aws_sfn_state_machine.test"
 	resourceName := "aws_sfn_state_machine.test"
diff --git a/aws/data_source_aws_sns_test.go b/aws/data_source_aws_sns_test.go
index 9a0280c8103..0e821dc3a8e 100644
--- a/aws/data_source_aws_sns_test.go
+++ b/aws/data_source_aws_sns_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccDataSourceAwsSnsTopic(t *testing.T) {
+func TestAccDataSourceAwsSnsTopic_basic(t *testing.T) {
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:  func() { testAccPreCheck(t) },
 		Providers: testAccProviders,
diff --git a/aws/data_source_aws_subnet_ids_test.go b/aws/data_source_aws_subnet_ids_test.go
index 540f1ea5bb1..d659cc14fd5 100644
--- a/aws/data_source_aws_subnet_ids_test.go
+++ b/aws/data_source_aws_subnet_ids_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsSubnetIDs(t *testing.T) {
+func TestAccDataSourceAwsSubnetIDs_basic(t *testing.T) {
 	rInt := acctest.RandIntRange(0, 256)
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
diff --git a/aws/data_source_aws_waf_ipset_test.go b/aws/data_source_aws_waf_ipset_test.go
index 3e28cc3d904..7042c989ad9 100644
--- a/aws/data_source_aws_waf_ipset_test.go
+++ b/aws/data_source_aws_waf_ipset_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafIPSet_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafIPSet_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_waf_ipset.ipset"
 	datasourceName := "data.aws_waf_ipset.ipset"
diff --git a/aws/data_source_aws_waf_rate_based_rule_test.go b/aws/data_source_aws_waf_rate_based_rule_test.go
index f6642488f53..8d6e36ef7ba 100644
--- a/aws/data_source_aws_waf_rate_based_rule_test.go
+++ b/aws/data_source_aws_waf_rate_based_rule_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafRateBasedRule_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafRateBasedRule_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_waf_rate_based_rule.wafrule"
 	datasourceName := "data.aws_waf_rate_based_rule.wafrule"
diff --git a/aws/data_source_aws_waf_rule_test.go b/aws/data_source_aws_waf_rule_test.go
index 76c5b580c50..0021da3c325 100644
--- a/aws/data_source_aws_waf_rule_test.go
+++ b/aws/data_source_aws_waf_rule_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafRule_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafRule_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_waf_rule.wafrule"
 	datasourceName := "data.aws_waf_rule.wafrule"
diff --git a/aws/data_source_aws_waf_web_acl_test.go b/aws/data_source_aws_waf_web_acl_test.go
index 6b62025aee2..8cac4bac210 100644
--- a/aws/data_source_aws_waf_web_acl_test.go
+++ b/aws/data_source_aws_waf_web_acl_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafWebAcl_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafWebAcl_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_waf_web_acl.web_acl"
 	datasourceName := "data.aws_waf_web_acl.web_acl"
diff --git a/aws/data_source_aws_wafregional_ipset_test.go b/aws/data_source_aws_wafregional_ipset_test.go
index 4bd2d0eb93a..3841e900a27 100644
--- a/aws/data_source_aws_wafregional_ipset_test.go
+++ b/aws/data_source_aws_wafregional_ipset_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafRegionalIPSet_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafRegionalIPSet_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_wafregional_ipset.ipset"
 	datasourceName := "data.aws_wafregional_ipset.ipset"
diff --git a/aws/data_source_aws_wafregional_rate_based_rule_test.go b/aws/data_source_aws_wafregional_rate_based_rule_test.go
index 5002b60ff7f..dcc3083cb59 100644
--- a/aws/data_source_aws_wafregional_rate_based_rule_test.go
+++ b/aws/data_source_aws_wafregional_rate_based_rule_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafRegionalRateBasedRule_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafRegionalRateBasedRule_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_wafregional_rate_based_rule.wafrule"
 	datasourceName := "data.aws_wafregional_rate_based_rule.wafrule"
diff --git a/aws/data_source_aws_wafregional_rule_test.go b/aws/data_source_aws_wafregional_rule_test.go
index 283b773a300..4bc8b9f69bb 100644
--- a/aws/data_source_aws_wafregional_rule_test.go
+++ b/aws/data_source_aws_wafregional_rule_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafRegionalRule_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafRegionalRule_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_wafregional_rule.wafrule"
 	datasourceName := "data.aws_wafregional_rule.wafrule"
diff --git a/aws/data_source_aws_wafregional_web_acl_test.go b/aws/data_source_aws_wafregional_web_acl_test.go
index 3e8ada3a86b..4232a295cd1 100644
--- a/aws/data_source_aws_wafregional_web_acl_test.go
+++ b/aws/data_source_aws_wafregional_web_acl_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafRegionalWebAcl_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafRegionalWebAcl_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_wafregional_web_acl.web_acl"
 	datasourceName := "data.aws_wafregional_web_acl.web_acl"
diff --git a/aws/data_source_aws_wafv2_ip_set_test.go b/aws/data_source_aws_wafv2_ip_set_test.go
index 050b961cba6..f5072e68a48 100644
--- a/aws/data_source_aws_wafv2_ip_set_test.go
+++ b/aws/data_source_aws_wafv2_ip_set_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafv2IPSet_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafv2IPSet_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_wafv2_ip_set.test"
 	datasourceName := "data.aws_wafv2_ip_set.test"
diff --git a/aws/data_source_aws_wafv2_regex_pattern_set_test.go b/aws/data_source_aws_wafv2_regex_pattern_set_test.go
index 4ef797f2603..d00a51811f5 100644
--- a/aws/data_source_aws_wafv2_regex_pattern_set_test.go
+++ b/aws/data_source_aws_wafv2_regex_pattern_set_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafv2RegexPatternSet_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafv2RegexPatternSet_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_wafv2_regex_pattern_set.test"
 	datasourceName := "data.aws_wafv2_regex_pattern_set.test"
diff --git a/aws/data_source_aws_wafv2_rule_group_test.go b/aws/data_source_aws_wafv2_rule_group_test.go
index 42df2d0e05a..a59f9db6536 100644
--- a/aws/data_source_aws_wafv2_rule_group_test.go
+++ b/aws/data_source_aws_wafv2_rule_group_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafv2RuleGroup_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafv2RuleGroup_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_wafv2_rule_group.test"
 	datasourceName := "data.aws_wafv2_rule_group.test"
diff --git a/aws/data_source_aws_wafv2_web_acl_test.go b/aws/data_source_aws_wafv2_web_acl_test.go
index 3df5f9354db..b31864f1c7f 100644
--- a/aws/data_source_aws_wafv2_web_acl_test.go
+++ b/aws/data_source_aws_wafv2_web_acl_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 )
 
-func TestAccDataSourceAwsWafv2WebACL_Basic(t *testing.T) {
+func TestAccDataSourceAwsWafv2WebACL_basic(t *testing.T) {
 	name := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_wafv2_web_acl.test"
 	datasourceName := "data.aws_wafv2_web_acl.test"
diff --git a/aws/resource_aws_accessanalyzer_test.go b/aws/resource_aws_accessanalyzer_test.go
index 8599262fc09..f0be1162d0e 100644
--- a/aws/resource_aws_accessanalyzer_test.go
+++ b/aws/resource_aws_accessanalyzer_test.go
@@ -8,7 +8,7 @@ import (
 
 // AccessAnalyzer is limited to one per region, so run serially
 // locally and in TeamCity.
-func TestAccAWSAccessAnalyzer(t *testing.T) {
+func TestAccAWSAccessAnalyzer_serial(t *testing.T) {
 	testCases := map[string]map[string]func(t *testing.T){
 		"Analyzer": {
 			"basic":      testAccAWSAccessAnalyzerAnalyzer_basic,
diff --git a/aws/resource_aws_acmpca_certificate_authority_test.go b/aws/resource_aws_acmpca_certificate_authority_test.go
index 91659c37ed5..b6dbf99b311 100644
--- a/aws/resource_aws_acmpca_certificate_authority_test.go
+++ b/aws/resource_aws_acmpca_certificate_authority_test.go
@@ -60,7 +60,7 @@ func testSweepAcmpcaCertificateAuthorities(region string) error {
 	return nil
 }
 
-func TestAccAwsAcmpcaCertificateAuthority_Basic(t *testing.T) {
+func TestAccAwsAcmpcaCertificateAuthority_basic(t *testing.T) {
 	var certificateAuthority acmpca.CertificateAuthority
 	resourceName := "aws_acmpca_certificate_authority.test"
 
diff --git a/aws/resource_aws_ami_launch_permission_test.go b/aws/resource_aws_ami_launch_permission_test.go
index 4f5da34024d..79d3f584406 100644
--- a/aws/resource_aws_ami_launch_permission_test.go
+++ b/aws/resource_aws_ami_launch_permission_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSAMILaunchPermission_Basic(t *testing.T) {
+func TestAccAWSAMILaunchPermission_basic(t *testing.T) {
 	resourceName := "aws_ami_launch_permission.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 
diff --git a/aws/resource_aws_apigatewayv2_api_mapping_test.go b/aws/resource_aws_apigatewayv2_api_mapping_test.go
index 8658caea03c..e697d1e2a73 100644
--- a/aws/resource_aws_apigatewayv2_api_mapping_test.go
+++ b/aws/resource_aws_apigatewayv2_api_mapping_test.go
@@ -15,7 +15,7 @@ import (
 )
 
 // These tests need to be serialized, else resources get orphaned after "TooManyRequests" errors.
-func TestAccAWSAPIGatewayV2ApiMapping(t *testing.T) {
+func TestAccAWSAPIGatewayV2ApiMapping_basic(t *testing.T) {
 	var certificateArn string
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 
diff --git a/aws/resource_aws_appmesh_test.go b/aws/resource_aws_appmesh_test.go
index 86bb8a44f76..fb1e6ca33a5 100644
--- a/aws/resource_aws_appmesh_test.go
+++ b/aws/resource_aws_appmesh_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 )
 
-func TestAccAWSAppmesh(t *testing.T) {
+func TestAccAWSAppmesh_serial(t *testing.T) {
 	testCases := map[string]map[string]func(t *testing.T){
 		"Mesh": {
 			"basic":        testAccAwsAppmeshMesh_basic,
diff --git a/aws/resource_aws_cloudtrail_test.go b/aws/resource_aws_cloudtrail_test.go
index ee6793fab3f..1a8884453ac 100644
--- a/aws/resource_aws_cloudtrail_test.go
+++ b/aws/resource_aws_cloudtrail_test.go
@@ -91,7 +91,7 @@ func testSweepCloudTrails(region string) error {
 	return sweeperErrs.ErrorOrNil()
 }
 
-func TestAccAWSCloudTrail(t *testing.T) {
+func TestAccAWSCloudTrail_serial(t *testing.T) {
 	testCases := map[string]map[string]func(t *testing.T){
 		"Trail": {
 			"basic":                      testAccAWSCloudTrail_basic,
diff --git a/aws/resource_aws_cloudwatch_event_permission_test.go b/aws/resource_aws_cloudwatch_event_permission_test.go
index d2bb32c927d..31c12fe02f2 100644
--- a/aws/resource_aws_cloudwatch_event_permission_test.go
+++ b/aws/resource_aws_cloudwatch_event_permission_test.go
@@ -67,7 +67,7 @@ func testSweepCloudWatchEventPermissions(region string) error {
 	return nil
 }
 
-func TestAccAWSCloudWatchEventPermission_Basic(t *testing.T) {
+func TestAccAWSCloudWatchEventPermission_basic(t *testing.T) {
 	principal1 := "111111111111"
 	principal2 := "*"
 	statementID := acctest.RandomWithPrefix(t.Name())
diff --git a/aws/resource_aws_codebuild_source_credential_test.go b/aws/resource_aws_codebuild_source_credential_test.go
index 48b53e9446a..2f9f9a7d17a 100644
--- a/aws/resource_aws_codebuild_source_credential_test.go
+++ b/aws/resource_aws_codebuild_source_credential_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSCodeBuildSourceCredential_Basic(t *testing.T) {
+func TestAccAWSCodeBuildSourceCredential_basic(t *testing.T) {
 	var sourceCredentialsInfo codebuild.SourceCredentialsInfo
 	token := acctest.RandomWithPrefix("token")
 	resourceName := "aws_codebuild_source_credential.test"
diff --git a/aws/resource_aws_codepipeline_test.go b/aws/resource_aws_codepipeline_test.go
index e55e613136c..bace7eb37c4 100644
--- a/aws/resource_aws_codepipeline_test.go
+++ b/aws/resource_aws_codepipeline_test.go
@@ -387,7 +387,7 @@ func TestAccAWSCodePipeline_multiregion_ConvertSingleRegion(t *testing.T) {
 	})
 }
 
-func TestAccAWSCodePipelineWithNamespace(t *testing.T) {
+func TestAccAWSCodePipeline_WithNamespace(t *testing.T) {
 	if os.Getenv("GITHUB_TOKEN") == "" {
 		t.Skip("Environment variable GITHUB_TOKEN is not set")
 	}
diff --git a/aws/resource_aws_codestarnotifications_notification_rule_test.go b/aws/resource_aws_codestarnotifications_notification_rule_test.go
index 7ac29dd3b92..94e6c06ceb7 100644
--- a/aws/resource_aws_codestarnotifications_notification_rule_test.go
+++ b/aws/resource_aws_codestarnotifications_notification_rule_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSCodeStarNotificationsNotificationRule_Basic(t *testing.T) {
+func TestAccAWSCodeStarNotificationsNotificationRule_basic(t *testing.T) {
 	resourceName := "aws_codestarnotifications_notification_rule.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 
diff --git a/aws/resource_aws_config_test.go b/aws/resource_aws_config_test.go
index 5fa079b8ca5..947995ad1ef 100644
--- a/aws/resource_aws_config_test.go
+++ b/aws/resource_aws_config_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 )
 
-func TestAccAWSConfig(t *testing.T) {
+func TestAccAWSConfig_serial(t *testing.T) {
 	testCases := map[string]map[string]func(t *testing.T){
 		"Config": {
 			"basic":            testAccConfigConfigRule_basic,
diff --git a/aws/resource_aws_dlm_lifecycle_policy_test.go b/aws/resource_aws_dlm_lifecycle_policy_test.go
index 10b84f5be56..87bca66f0e2 100644
--- a/aws/resource_aws_dlm_lifecycle_policy_test.go
+++ b/aws/resource_aws_dlm_lifecycle_policy_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSDlmLifecyclePolicy_Basic(t *testing.T) {
+func TestAccAWSDlmLifecyclePolicy_basic(t *testing.T) {
 	resourceName := "aws_dlm_lifecycle_policy.basic"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 
diff --git a/aws/resource_aws_dms_certificate_test.go b/aws/resource_aws_dms_certificate_test.go
index b82e719f02b..b7e7d22e499 100644
--- a/aws/resource_aws_dms_certificate_test.go
+++ b/aws/resource_aws_dms_certificate_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSDmsCertificateBasic(t *testing.T) {
+func TestAccAWSDmsCertificate_basic(t *testing.T) {
 	resourceName := "aws_dms_certificate.dms_certificate"
 	randId := acctest.RandString(8)
 
diff --git a/aws/resource_aws_dms_endpoint_test.go b/aws/resource_aws_dms_endpoint_test.go
index 2c951e13c00..974ddf2f74a 100644
--- a/aws/resource_aws_dms_endpoint_test.go
+++ b/aws/resource_aws_dms_endpoint_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAwsDmsEndpoint_Basic(t *testing.T) {
+func TestAccAwsDmsEndpoint_basic(t *testing.T) {
 	resourceName := "aws_dms_endpoint.dms_endpoint"
 	randId := acctest.RandString(8) + "-basic"
 
diff --git a/aws/resource_aws_dms_replication_instance_test.go b/aws/resource_aws_dms_replication_instance_test.go
index 4ed59901e0d..a991c6ebe7d 100644
--- a/aws/resource_aws_dms_replication_instance_test.go
+++ b/aws/resource_aws_dms_replication_instance_test.go
@@ -77,7 +77,7 @@ func testSweepDmsReplicationInstances(region string) error {
 	return nil
 }
 
-func TestAccAWSDmsReplicationInstance_Basic(t *testing.T) {
+func TestAccAWSDmsReplicationInstance_basic(t *testing.T) {
 	// NOTE: Using larger dms.c4.large here for AWS GovCloud (US) support
 	replicationInstanceClass := "dms.c4.large"
 	resourceName := "aws_dms_replication_instance.test"
diff --git a/aws/resource_aws_dms_replication_subnet_group_test.go b/aws/resource_aws_dms_replication_subnet_group_test.go
index 4da25adfb19..525a169cce4 100644
--- a/aws/resource_aws_dms_replication_subnet_group_test.go
+++ b/aws/resource_aws_dms_replication_subnet_group_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSDmsReplicationSubnetGroupBasic(t *testing.T) {
+func TestAccAWSDmsReplicationSubnetGroup_basic(t *testing.T) {
 	resourceName := "aws_dms_replication_subnet_group.dms_replication_subnet_group"
 	randId := acctest.RandString(8)
 
diff --git a/aws/resource_aws_dms_replication_task_test.go b/aws/resource_aws_dms_replication_task_test.go
index 7f6ea96e922..6086d35367b 100644
--- a/aws/resource_aws_dms_replication_task_test.go
+++ b/aws/resource_aws_dms_replication_task_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSDmsReplicationTaskBasic(t *testing.T) {
+func TestAccAWSDmsReplicationTask_basic(t *testing.T) {
 	resourceName := "aws_dms_replication_task.dms_replication_task"
 	randId := acctest.RandString(8)
 
diff --git a/aws/resource_aws_dx_hosted_transit_virtual_interface_test.go b/aws/resource_aws_dx_hosted_transit_virtual_interface_test.go
index dc5ae878b94..a9f61bc6294 100644
--- a/aws/resource_aws_dx_hosted_transit_virtual_interface_test.go
+++ b/aws/resource_aws_dx_hosted_transit_virtual_interface_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAwsDxHostedTransitVirtualInterface(t *testing.T) {
+func TestAccAwsDxHostedTransitVirtualInterface_serial(t *testing.T) {
 	testCases := map[string]func(t *testing.T){
 		"basic":        testAccAwsDxHostedTransitVirtualInterface_basic,
 		"accepterTags": testAccAwsDxHostedTransitVirtualInterface_accepterTags,
diff --git a/aws/resource_aws_dx_transit_virtual_interface_test.go b/aws/resource_aws_dx_transit_virtual_interface_test.go
index 33ad9010f2e..f8b7023f8ed 100644
--- a/aws/resource_aws_dx_transit_virtual_interface_test.go
+++ b/aws/resource_aws_dx_transit_virtual_interface_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAwsDxTransitVirtualInterface(t *testing.T) {
+func TestAccAwsDxTransitVirtualInterface_serial(t *testing.T) {
 	testCases := map[string]func(t *testing.T){
 		"basic": testAccAwsDxTransitVirtualInterface_basic,
 		"tags":  testAccAwsDxTransitVirtualInterface_Tags,
diff --git a/aws/resource_aws_ec2_client_vpn_endpoint_test.go b/aws/resource_aws_ec2_client_vpn_endpoint_test.go
index 85cad5c7cf5..1aba11f3997 100644
--- a/aws/resource_aws_ec2_client_vpn_endpoint_test.go
+++ b/aws/resource_aws_ec2_client_vpn_endpoint_test.go
@@ -77,7 +77,7 @@ func testSweepEc2ClientVpnEndpoints(region string) error {
 //   "This place is not a place of honor... no highly esteemed deed is commemorated here... nothing valued is here.
 //   What is here was dangerous and repulsive to us. This message is a warning about danger."
 //   --  https://hyperallergic.com/312318/a-nuclear-warning-designed-to-last-10000-years/
-func TestAccAwsEc2ClientVpn(t *testing.T) {
+func TestAccAwsEc2ClientVpn_serial(t *testing.T) {
 	testCases := map[string]map[string]func(t *testing.T){
 		"Endpoint": {
 			"basic":             testAccAwsEc2ClientVpnEndpoint_basic,
diff --git a/aws/resource_aws_glue_connection_test.go b/aws/resource_aws_glue_connection_test.go
index a718bfff7b9..f38a5be94f6 100644
--- a/aws/resource_aws_glue_connection_test.go
+++ b/aws/resource_aws_glue_connection_test.go
@@ -57,7 +57,7 @@ func testSweepGlueConnections(region string) error {
 	return nil
 }
 
-func TestAccAWSGlueConnection_Basic(t *testing.T) {
+func TestAccAWSGlueConnection_basic(t *testing.T) {
 	var connection glue.Connection
 
 	rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5))
diff --git a/aws/resource_aws_glue_job_test.go b/aws/resource_aws_glue_job_test.go
index 99c7029afe6..bc2192e9fab 100644
--- a/aws/resource_aws_glue_job_test.go
+++ b/aws/resource_aws_glue_job_test.go
@@ -55,7 +55,7 @@ func testSweepGlueJobs(region string) error {
 	return nil
 }
 
-func TestAccAWSGlueJob_Basic(t *testing.T) {
+func TestAccAWSGlueJob_basic(t *testing.T) {
 	var job glue.Job
 
 	rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5))
diff --git a/aws/resource_aws_glue_security_configuration_test.go b/aws/resource_aws_glue_security_configuration_test.go
index 8cd1d8d4b27..fb8344c399a 100644
--- a/aws/resource_aws_glue_security_configuration_test.go
+++ b/aws/resource_aws_glue_security_configuration_test.go
@@ -60,7 +60,7 @@ func testSweepGlueSecurityConfigurations(region string) error {
 	return nil
 }
 
-func TestAccAWSGlueSecurityConfiguration_Basic(t *testing.T) {
+func TestAccAWSGlueSecurityConfiguration_basic(t *testing.T) {
 	var securityConfiguration glue.SecurityConfiguration
 
 	rName := acctest.RandomWithPrefix("tf-acc-test")
diff --git a/aws/resource_aws_glue_trigger_test.go b/aws/resource_aws_glue_trigger_test.go
index aa1345a3668..337fb518758 100644
--- a/aws/resource_aws_glue_trigger_test.go
+++ b/aws/resource_aws_glue_trigger_test.go
@@ -54,7 +54,7 @@ func testSweepGlueTriggers(region string) error {
 	return nil
 }
 
-func TestAccAWSGlueTrigger_Basic(t *testing.T) {
+func TestAccAWSGlueTrigger_basic(t *testing.T) {
 	var trigger glue.Trigger
 
 	rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5))
diff --git a/aws/resource_aws_glue_workflow_test.go b/aws/resource_aws_glue_workflow_test.go
index f33d211ae71..0c9753c6e70 100644
--- a/aws/resource_aws_glue_workflow_test.go
+++ b/aws/resource_aws_glue_workflow_test.go
@@ -44,7 +44,7 @@ func testSweepGlueWorkflow(region string) error {
 	return nil
 }
 
-func TestAccAWSGlueWorkflow_Basic(t *testing.T) {
+func TestAccAWSGlueWorkflow_basic(t *testing.T) {
 	var workflow glue.Workflow
 
 	rName := fmt.Sprintf("tf-acc-test-%s", acctest.RandString(5))
diff --git a/aws/resource_aws_guardduty_test.go b/aws/resource_aws_guardduty_test.go
index 8b9f12e4d9c..2c507424505 100644
--- a/aws/resource_aws_guardduty_test.go
+++ b/aws/resource_aws_guardduty_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 )
 
-func TestAccAWSGuardDuty(t *testing.T) {
+func TestAccAWSGuardDuty_serial(t *testing.T) {
 	testCases := map[string]map[string]func(t *testing.T){
 		"Detector": {
 			"basic":            testAccAwsGuardDutyDetector_basic,
diff --git a/aws/resource_aws_iam_account_alias_test.go b/aws/resource_aws_iam_account_alias_test.go
index d360e318a76..58ba8533e27 100644
--- a/aws/resource_aws_iam_account_alias_test.go
+++ b/aws/resource_aws_iam_account_alias_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSIAMAccountAlias(t *testing.T) {
+func TestAccAWSIAMAccountAlias_serial(t *testing.T) {
 	testCases := map[string]map[string]func(t *testing.T){
 		"Basic": {
 			"basic": testAccAWSIAMAccountAlias_basic_with_datasource,
diff --git a/aws/resource_aws_kms_grant_test.go b/aws/resource_aws_kms_grant_test.go
index b156552f35f..f93ef855ff0 100644
--- a/aws/resource_aws_kms_grant_test.go
+++ b/aws/resource_aws_kms_grant_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
 )
 
-func TestAccAWSKmsGrant_Basic(t *testing.T) {
+func TestAccAWSKmsGrant_basic(t *testing.T) {
 	resourceName := "aws_kms_grant.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 
diff --git a/aws/resource_aws_lb_listener_rule_test.go b/aws/resource_aws_lb_listener_rule_test.go
index d9a03ca4c3a..f2611816db1 100644
--- a/aws/resource_aws_lb_listener_rule_test.go
+++ b/aws/resource_aws_lb_listener_rule_test.go
@@ -181,7 +181,7 @@ func TestAccAWSLBListenerRule_forwardWeighted(t *testing.T) {
 	})
 }
 
-func TestAccAWSLBListenerRuleBackwardsCompatibility(t *testing.T) {
+func TestAccAWSLBListenerRule_BackwardsCompatibility(t *testing.T) {
 	var conf elbv2.Rule
 	lbName := fmt.Sprintf("testrule-basic-%s", acctest.RandString(13))
 	targetGroupName := fmt.Sprintf("testtargetgroup-%s", acctest.RandString(10))
diff --git a/aws/resource_aws_lb_target_group_test.go b/aws/resource_aws_lb_target_group_test.go
index 585a9d98ceb..c6c839fac2c 100644
--- a/aws/resource_aws_lb_target_group_test.go
+++ b/aws/resource_aws_lb_target_group_test.go
@@ -421,7 +421,7 @@ func TestAccAWSLBTargetGroup_TCP_HTTPHealthCheck(t *testing.T) {
 	})
 }
 
-func TestAccAWSLBTargetGroupBackwardsCompatibility(t *testing.T) {
+func TestAccAWSLBTargetGroup_BackwardsCompatibility(t *testing.T) {
 	var conf elbv2.TargetGroup
 	targetGroupName := fmt.Sprintf("test-target-group-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
 	resourceName := "aws_alb_target_group.test"
diff --git a/aws/resource_aws_lb_test.go b/aws/resource_aws_lb_test.go
index f1facebb960..9d9f97a5b8c 100644
--- a/aws/resource_aws_lb_test.go
+++ b/aws/resource_aws_lb_test.go
@@ -191,7 +191,7 @@ func TestAccAWSLB_networkLoadbalancerEIP(t *testing.T) {
 	})
 }
 
-func TestAccAWSLBBackwardsCompatibility(t *testing.T) {
+func TestAccAWSLB_BackwardsCompatibility(t *testing.T) {
 	var conf elbv2.LoadBalancer
 	lbName := fmt.Sprintf("testaccawslb-basic-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
 	resourceName := "aws_alb.lb_test"
diff --git a/aws/resource_aws_opsworks_rds_db_instance_test.go b/aws/resource_aws_opsworks_rds_db_instance_test.go
index 69765af9f49..eb3a4094658 100644
--- a/aws/resource_aws_opsworks_rds_db_instance_test.go
+++ b/aws/resource_aws_opsworks_rds_db_instance_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSOpsworksRdsDbInstance(t *testing.T) {
+func TestAccAWSOpsworksRdsDbInstance_basic(t *testing.T) {
 	sName := fmt.Sprintf("test-db-instance-%d", acctest.RandInt())
 	var opsdb opsworks.RdsDbInstance
 	resource.ParallelTest(t, resource.TestCase{
diff --git a/aws/resource_aws_opsworks_user_profile_test.go b/aws/resource_aws_opsworks_user_profile_test.go
index 658d6fef8dd..12e5f98ecd8 100644
--- a/aws/resource_aws_opsworks_user_profile_test.go
+++ b/aws/resource_aws_opsworks_user_profile_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSOpsworksUserProfile(t *testing.T) {
+func TestAccAWSOpsworksUserProfile_basic(t *testing.T) {
 	rName := fmt.Sprintf("test-user-%d", acctest.RandInt())
 	updateRName := fmt.Sprintf("test-user-%d", acctest.RandInt())
 	resource.ParallelTest(t, resource.TestCase{
diff --git a/aws/resource_aws_organizations_test.go b/aws/resource_aws_organizations_test.go
index ce50e77ba81..91366445016 100644
--- a/aws/resource_aws_organizations_test.go
+++ b/aws/resource_aws_organizations_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 )
 
-func TestAccAWSOrganizations(t *testing.T) {
+func TestAccAWSOrganizations_serial(t *testing.T) {
 	testCases := map[string]map[string]func(t *testing.T){
 		"Organization": {
 			"basic":                      testAccAwsOrganizationsOrganization_basic,
diff --git a/aws/resource_aws_redshift_snapshot_copy_grant_test.go b/aws/resource_aws_redshift_snapshot_copy_grant_test.go
index 6b94094f99e..526c4c916c9 100644
--- a/aws/resource_aws_redshift_snapshot_copy_grant_test.go
+++ b/aws/resource_aws_redshift_snapshot_copy_grant_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSRedshiftSnapshotCopyGrant_Basic(t *testing.T) {
+func TestAccAWSRedshiftSnapshotCopyGrant_basic(t *testing.T) {
 	resourceName := "aws_redshift_snapshot_copy_grant.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 
diff --git a/aws/resource_aws_route53_query_log_test.go b/aws/resource_aws_route53_query_log_test.go
index 8a236e055e5..6c728144af7 100644
--- a/aws/resource_aws_route53_query_log_test.go
+++ b/aws/resource_aws_route53_query_log_test.go
@@ -68,7 +68,7 @@ func testSweepRoute53QueryLogs(region string) error {
 	return sweeperErrs.ErrorOrNil()
 }
 
-func TestAccAWSRoute53QueryLog_Basic(t *testing.T) {
+func TestAccAWSRoute53QueryLog_basic(t *testing.T) {
 	// The underlying resources are sensitive to where they are located
 	// Use us-east-1 for testing
 	oldRegion := os.Getenv("AWS_DEFAULT_REGION")
diff --git a/aws/resource_aws_s3_account_public_access_block_test.go b/aws/resource_aws_s3_account_public_access_block_test.go
index d9057a6111f..fbeb46431db 100644
--- a/aws/resource_aws_s3_account_public_access_block_test.go
+++ b/aws/resource_aws_s3_account_public_access_block_test.go
@@ -13,7 +13,7 @@ import (
 
 // S3 account-level settings must run serialized
 // for TeamCity environment
-func TestAccAWSS3Account(t *testing.T) {
+func TestAccAWSS3Account_serial(t *testing.T) {
 	testCases := map[string]map[string]func(t *testing.T){
 		"PublicAccessBlock": {
 			"basic":                 testAccAWSS3AccountPublicAccessBlock_basic,
diff --git a/aws/resource_aws_sagemaker_endpoint_configuration_test.go b/aws/resource_aws_sagemaker_endpoint_configuration_test.go
index ed1e309f04d..10a5004abfe 100644
--- a/aws/resource_aws_sagemaker_endpoint_configuration_test.go
+++ b/aws/resource_aws_sagemaker_endpoint_configuration_test.go
@@ -57,7 +57,7 @@ func testSweepSagemakerEndpointConfigurations(region string) error {
 	return nil
 }
 
-func TestAccAWSSagemakerEndpointConfiguration_Basic(t *testing.T) {
+func TestAccAWSSagemakerEndpointConfiguration_basic(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_sagemaker_endpoint_configuration.foo"
 
diff --git a/aws/resource_aws_sagemaker_notebook_instance_lifecycle_configuration_test.go b/aws/resource_aws_sagemaker_notebook_instance_lifecycle_configuration_test.go
index c278a27935a..d35575639c3 100644
--- a/aws/resource_aws_sagemaker_notebook_instance_lifecycle_configuration_test.go
+++ b/aws/resource_aws_sagemaker_notebook_instance_lifecycle_configuration_test.go
@@ -68,7 +68,7 @@ func testSweepSagemakerNotebookInstanceLifecycleConfiguration(region string) err
 	return nil
 }
 
-func TestAccAWSSagemakerNotebookInstanceLifecycleConfiguration_Basic(t *testing.T) {
+func TestAccAWSSagemakerNotebookInstanceLifecycleConfiguration_basic(t *testing.T) {
 	var lifecycleConfig sagemaker.DescribeNotebookInstanceLifecycleConfigOutput
 	rName := acctest.RandomWithPrefix(SagemakerNotebookInstanceLifecycleConfigurationResourcePrefix)
 	resourceName := "aws_sagemaker_notebook_instance_lifecycle_configuration.test"
diff --git a/aws/resource_aws_secretsmanager_secret_rotation_test.go b/aws/resource_aws_secretsmanager_secret_rotation_test.go
index 7fafb0bf0de..cf1d2e840b5 100644
--- a/aws/resource_aws_secretsmanager_secret_rotation_test.go
+++ b/aws/resource_aws_secretsmanager_secret_rotation_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAwsSecretsManagerSecretRotation(t *testing.T) {
+func TestAccAwsSecretsManagerSecretRotation_basic(t *testing.T) {
 	var secret secretsmanager.DescribeSecretOutput
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_secretsmanager_secret_rotation.test"
diff --git a/aws/resource_aws_secretsmanager_secret_test.go b/aws/resource_aws_secretsmanager_secret_test.go
index b66bd9ddfff..af82f6ce841 100644
--- a/aws/resource_aws_secretsmanager_secret_test.go
+++ b/aws/resource_aws_secretsmanager_secret_test.go
@@ -65,7 +65,7 @@ func testSweepSecretsManagerSecrets(region string) error {
 	return nil
 }
 
-func TestAccAwsSecretsManagerSecret_Basic(t *testing.T) {
+func TestAccAwsSecretsManagerSecret_basic(t *testing.T) {
 	var secret secretsmanager.DescribeSecretOutput
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_secretsmanager_secret.test"
diff --git a/aws/resource_aws_securityhub_test.go b/aws/resource_aws_securityhub_test.go
index a6151c71392..fc0c7555873 100644
--- a/aws/resource_aws_securityhub_test.go
+++ b/aws/resource_aws_securityhub_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 )
 
-func TestAccAWSSecurityHub(t *testing.T) {
+func TestAccAWSSecurityHub_serial(t *testing.T) {
 	testCases := map[string]map[string]func(t *testing.T){
 		"Account": {
 			"basic": testAccAWSSecurityHubAccount_basic,
diff --git a/aws/resource_aws_servicecatalog_portfolio_test.go b/aws/resource_aws_servicecatalog_portfolio_test.go
index 63e51594c39..85dfce04ba6 100644
--- a/aws/resource_aws_servicecatalog_portfolio_test.go
+++ b/aws/resource_aws_servicecatalog_portfolio_test.go
@@ -14,7 +14,7 @@ import (
 	"testing"
 )
 
-func TestAccAWSServiceCatalogPortfolio_Basic(t *testing.T) {
+func TestAccAWSServiceCatalogPortfolio_basic(t *testing.T) {
 	resourceName := "aws_servicecatalog_portfolio.test"
 	name := acctest.RandString(5)
 	var dpo servicecatalog.DescribePortfolioOutput
diff --git a/aws/resource_aws_ses_template_test.go b/aws/resource_aws_ses_template_test.go
index 2ca234a44bb..abe15f4f2f9 100644
--- a/aws/resource_aws_ses_template_test.go
+++ b/aws/resource_aws_ses_template_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSSesTemplate_Basic(t *testing.T) {
+func TestAccAWSSesTemplate_basic(t *testing.T) {
 	resourceName := "aws_ses_template.test"
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	var template ses.Template
diff --git a/aws/resource_aws_snapshot_create_volume_permission_test.go b/aws/resource_aws_snapshot_create_volume_permission_test.go
index a8ed74b4e98..fe2230b7c98 100644
--- a/aws/resource_aws_snapshot_create_volume_permission_test.go
+++ b/aws/resource_aws_snapshot_create_volume_permission_test.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSSnapshotCreateVolumePermission_Basic(t *testing.T) {
+func TestAccAWSSnapshotCreateVolumePermission_basic(t *testing.T) {
 	var snapshotId string
 	accountId := "111122223333"
 
diff --git a/aws/resource_aws_sns_sms_preferences_test.go b/aws/resource_aws_sns_sms_preferences_test.go
index 82eab3f6710..da6883c7e9b 100644
--- a/aws/resource_aws_sns_sms_preferences_test.go
+++ b/aws/resource_aws_sns_sms_preferences_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 // The preferences are account-wide, so the tests must be serialized
-func TestAccAWSSNSSMSPreferences(t *testing.T) {
+func TestAccAWSSNSSMSPreferences_serial(t *testing.T) {
 	testCases := map[string]func(t *testing.T){
 		"almostAll":      testAccAWSSNSSMSPreferences_almostAll,
 		"defaultSMSType": testAccAWSSNSSMSPreferences_defaultSMSType,
diff --git a/aws/resource_aws_spot_datafeed_subscription_test.go b/aws/resource_aws_spot_datafeed_subscription_test.go
index 7233cd0f5a7..c3c9d849680 100644
--- a/aws/resource_aws_spot_datafeed_subscription_test.go
+++ b/aws/resource_aws_spot_datafeed_subscription_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSSpotDatafeedSubscription(t *testing.T) {
+func TestAccAWSSpotDatafeedSubscription_serial(t *testing.T) {
 	cases := map[string]func(t *testing.T){
 		"basic":      testAccAWSSpotDatafeedSubscription_basic,
 		"disappears": testAccAWSSpotDatafeedSubscription_disappears,
diff --git a/aws/resource_aws_spot_instance_request_test.go b/aws/resource_aws_spot_instance_request_test.go
index 003b376e171..fd6a311ef95 100644
--- a/aws/resource_aws_spot_instance_request_test.go
+++ b/aws/resource_aws_spot_instance_request_test.go
@@ -459,7 +459,7 @@ func testAccCheckAWSSpotInstanceRequestAttributesVPC(
 	}
 }
 
-func TestAccAWSSpotInstanceRequestInterruptStop(t *testing.T) {
+func TestAccAWSSpotInstanceRequest_InterruptStop(t *testing.T) {
 	var sir ec2.SpotInstanceRequest
 
 	resource.ParallelTest(t, resource.TestCase{
@@ -484,7 +484,7 @@ func TestAccAWSSpotInstanceRequestInterruptStop(t *testing.T) {
 	})
 }
 
-func TestAccAWSSpotInstanceRequestInterruptHibernate(t *testing.T) {
+func TestAccAWSSpotInstanceRequest_InterruptHibernate(t *testing.T) {
 	var sir ec2.SpotInstanceRequest
 
 	resource.ParallelTest(t, resource.TestCase{
diff --git a/aws/resource_aws_storagegateway_cached_iscsi_volume_test.go b/aws/resource_aws_storagegateway_cached_iscsi_volume_test.go
index 80d98119d04..c18362df0af 100644
--- a/aws/resource_aws_storagegateway_cached_iscsi_volume_test.go
+++ b/aws/resource_aws_storagegateway_cached_iscsi_volume_test.go
@@ -68,7 +68,7 @@ func TestParseStorageGatewayVolumeGatewayARNAndTargetNameFromARN(t *testing.T) {
 	}
 }
 
-func TestAccAWSStorageGatewayCachedIscsiVolume_Basic(t *testing.T) {
+func TestAccAWSStorageGatewayCachedIscsiVolume_basic(t *testing.T) {
 	var cachedIscsiVolume storagegateway.CachediSCSIVolume
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_storagegateway_cached_iscsi_volume.test"
diff --git a/aws/resource_aws_storagegateway_upload_buffer_test.go b/aws/resource_aws_storagegateway_upload_buffer_test.go
index 0fd4c9216ac..25f0c45dcc0 100644
--- a/aws/resource_aws_storagegateway_upload_buffer_test.go
+++ b/aws/resource_aws_storagegateway_upload_buffer_test.go
@@ -67,7 +67,7 @@ func TestDecodeStorageGatewayUploadBufferID(t *testing.T) {
 	}
 }
 
-func TestAccAWSStorageGatewayUploadBuffer_Basic(t *testing.T) {
+func TestAccAWSStorageGatewayUploadBuffer_basic(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_storagegateway_upload_buffer.test"
 	localDiskDataSourceName := "data.aws_storagegateway_local_disk.test"
diff --git a/aws/resource_aws_storagegateway_working_storage_test.go b/aws/resource_aws_storagegateway_working_storage_test.go
index 512f7314fa0..b32e9380067 100644
--- a/aws/resource_aws_storagegateway_working_storage_test.go
+++ b/aws/resource_aws_storagegateway_working_storage_test.go
@@ -67,7 +67,7 @@ func TestDecodeStorageGatewayWorkingStorageID(t *testing.T) {
 	}
 }
 
-func TestAccAWSStorageGatewayWorkingStorage_Basic(t *testing.T) {
+func TestAccAWSStorageGatewayWorkingStorage_basic(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_storagegateway_working_storage.test"
 	localDiskDataSourceName := "data.aws_storagegateway_local_disk.test"
diff --git a/aws/resource_aws_waf_regex_match_set_test.go b/aws/resource_aws_waf_regex_match_set_test.go
index 9096ca0f5ef..cb0e1221ede 100644
--- a/aws/resource_aws_waf_regex_match_set_test.go
+++ b/aws/resource_aws_waf_regex_match_set_test.go
@@ -78,7 +78,7 @@ func testSweepWafRegexMatchSet(region string) error {
 
 // Serialized acceptance tests due to WAF account limits
 // https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
-func TestAccAWSWafRegexMatchSet(t *testing.T) {
+func TestAccAWSWafRegexMatchSet_serial(t *testing.T) {
 	testCases := map[string]func(t *testing.T){
 		"basic":          testAccAWSWafRegexMatchSet_basic,
 		"changePatterns": testAccAWSWafRegexMatchSet_changePatterns,
diff --git a/aws/resource_aws_waf_regex_pattern_set_test.go b/aws/resource_aws_waf_regex_pattern_set_test.go
index 1c7b4e410c5..8145eb2e91e 100644
--- a/aws/resource_aws_waf_regex_pattern_set_test.go
+++ b/aws/resource_aws_waf_regex_pattern_set_test.go
@@ -15,7 +15,7 @@ import (
 
 // Serialized acceptance tests due to WAF account limits
 // https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
-func TestAccAWSWafRegexPatternSet(t *testing.T) {
+func TestAccAWSWafRegexPatternSet_serial(t *testing.T) {
 	testCases := map[string]func(t *testing.T){
 		"basic":          testAccAWSWafRegexPatternSet_basic,
 		"changePatterns": testAccAWSWafRegexPatternSet_changePatterns,
diff --git a/aws/resource_aws_wafregional_regex_match_set_test.go b/aws/resource_aws_wafregional_regex_match_set_test.go
index 5f77395cadc..4a0ab43d272 100644
--- a/aws/resource_aws_wafregional_regex_match_set_test.go
+++ b/aws/resource_aws_wafregional_regex_match_set_test.go
@@ -78,7 +78,7 @@ func testSweepWafRegionalRegexMatchSet(region string) error {
 
 // Serialized acceptance tests due to WAF account limits
 // https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
-func TestAccAWSWafRegionalRegexMatchSet(t *testing.T) {
+func TestAccAWSWafRegionalRegexMatchSet_serial(t *testing.T) {
 	testCases := map[string]func(t *testing.T){
 		"basic":          testAccAWSWafRegionalRegexMatchSet_basic,
 		"changePatterns": testAccAWSWafRegionalRegexMatchSet_changePatterns,
diff --git a/aws/resource_aws_wafregional_regex_pattern_set_test.go b/aws/resource_aws_wafregional_regex_pattern_set_test.go
index 55ea3b10399..347801ba1b8 100644
--- a/aws/resource_aws_wafregional_regex_pattern_set_test.go
+++ b/aws/resource_aws_wafregional_regex_pattern_set_test.go
@@ -15,7 +15,7 @@ import (
 
 // Serialized acceptance tests due to WAF account limits
 // https://docs.aws.amazon.com/waf/latest/developerguide/limits.html
-func TestAccAWSWafRegionalRegexPatternSet(t *testing.T) {
+func TestAccAWSWafRegionalRegexPatternSet_serial(t *testing.T) {
 	testCases := map[string]func(t *testing.T){
 		"basic":          testAccAWSWafRegionalRegexPatternSet_basic,
 		"changePatterns": testAccAWSWafRegionalRegexPatternSet_changePatterns,
diff --git a/aws/resource_aws_wafv2_ip_set_test.go b/aws/resource_aws_wafv2_ip_set_test.go
index 156a06180a2..9214110c4c8 100644
--- a/aws/resource_aws_wafv2_ip_set_test.go
+++ b/aws/resource_aws_wafv2_ip_set_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
 )
 
-func TestAccAwsWafv2IPSet_Basic(t *testing.T) {
+func TestAccAwsWafv2IPSet_basic(t *testing.T) {
 	var v wafv2.IPSet
 	ipSetName := fmt.Sprintf("ip-set-%s", acctest.RandString(5))
 	resourceName := "aws_wafv2_ip_set.ip_set"
diff --git a/aws/resource_aws_wafv2_regex_pattern_set_test.go b/aws/resource_aws_wafv2_regex_pattern_set_test.go
index ebb310329e3..2c619d9d8b5 100644
--- a/aws/resource_aws_wafv2_regex_pattern_set_test.go
+++ b/aws/resource_aws_wafv2_regex_pattern_set_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
 )
 
-func TestAccAwsWafv2RegexPatternSet_Basic(t *testing.T) {
+func TestAccAwsWafv2RegexPatternSet_basic(t *testing.T) {
 	var v wafv2.RegexPatternSet
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_wafv2_regex_pattern_set.test"
diff --git a/aws/resource_aws_wafv2_rule_group_test.go b/aws/resource_aws_wafv2_rule_group_test.go
index a82330ad2cf..0290f7ceaab 100644
--- a/aws/resource_aws_wafv2_rule_group_test.go
+++ b/aws/resource_aws_wafv2_rule_group_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-aws/aws/internal/tfawsresource"
 )
 
-func TestAccAwsWafv2RuleGroup_Basic(t *testing.T) {
+func TestAccAwsWafv2RuleGroup_basic(t *testing.T) {
 	var v wafv2.RuleGroup
 	ruleGroupName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_wafv2_rule_group.test"
diff --git a/aws/resource_aws_wafv2_web_acl_association_test.go b/aws/resource_aws_wafv2_web_acl_association_test.go
index f3a3032c03f..c8af36c328d 100644
--- a/aws/resource_aws_wafv2_web_acl_association_test.go
+++ b/aws/resource_aws_wafv2_web_acl_association_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAwsWafv2WebACLAssociation_Basic(t *testing.T) {
+func TestAccAwsWafv2WebACLAssociation_basic(t *testing.T) {
 	testName := fmt.Sprintf("web-acl-association-%s", acctest.RandString(5))
 	resourceName := "aws_wafv2_web_acl_association.test"
 
diff --git a/aws/resource_aws_wafv2_web_acl_test.go b/aws/resource_aws_wafv2_web_acl_test.go
index fc44ea651b6..07d7131fa75 100644
--- a/aws/resource_aws_wafv2_web_acl_test.go
+++ b/aws/resource_aws_wafv2_web_acl_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAwsWafv2WebACL_Basic(t *testing.T) {
+func TestAccAwsWafv2WebACL_basic(t *testing.T) {
 	var v wafv2.WebACL
 	webACLName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_wafv2_web_acl.test"
diff --git a/aws/resource_aws_worklink_fleet_test.go b/aws/resource_aws_worklink_fleet_test.go
index 7158dee4997..d37a71446e1 100644
--- a/aws/resource_aws_worklink_fleet_test.go
+++ b/aws/resource_aws_worklink_fleet_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSWorkLinkFleet_Basic(t *testing.T) {
+func TestAccAWSWorkLinkFleet_basic(t *testing.T) {
 	suffix := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	resourceName := "aws_worklink_fleet.test"
 
diff --git a/aws/resource_aws_worklink_website_certificate_authority_association_test.go b/aws/resource_aws_worklink_website_certificate_authority_association_test.go
index 7966e08ef14..ff6143c7623 100644
--- a/aws/resource_aws_worklink_website_certificate_authority_association_test.go
+++ b/aws/resource_aws_worklink_website_certificate_authority_association_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
 )
 
-func TestAccAWSWorkLinkWorkLinkWebsiteCertificateAuthorityAssociation_Basic(t *testing.T) {
+func TestAccAWSWorkLinkWorkLinkWebsiteCertificateAuthorityAssociation_basic(t *testing.T) {
 	suffix := acctest.RandStringFromCharSet(20, acctest.CharSetAlpha)
 	resourceName := "aws_worklink_website_certificate_authority_association.test"