diff --git a/aws/data_source_aws_mq_broker_test.go b/aws/data_source_aws_mq_broker_test.go
index 051225180ad..089d4bcefcd 100644
--- a/aws/data_source_aws_mq_broker_test.go
+++ b/aws/data_source_aws_mq_broker_test.go
@@ -19,8 +19,9 @@ func TestAccDataSourceAWSMqBroker_basic(t *testing.T) {
 	resourceName := "aws_mq_broker.acctest"
 
 	resource.ParallelTest(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck(mq.EndpointsID, t) },
-		Providers: testAccProviders,
+		PreCheck:   func() { testAccPreCheck(t); testAccPartitionHasServicePreCheck(mq.EndpointsID, t) },
+		ErrorCheck: testAccErrorCheck(t, mq.EndpointsID),
+		Providers:  testAccProviders,
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceAWSMqBrokerConfig_byId(brokerName, prefix),
diff --git a/aws/resource_aws_mq_broker_test.go b/aws/resource_aws_mq_broker_test.go
index d0fa5141d23..6bc9289b45c 100644
--- a/aws/resource_aws_mq_broker_test.go
+++ b/aws/resource_aws_mq_broker_test.go
@@ -263,6 +263,7 @@ func TestAccAWSMqBroker_basic(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -335,6 +336,7 @@ func TestAccAWSMqBroker_throughputOptimized(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -413,6 +415,7 @@ func TestAccAWSMqBroker_allFieldsDefaultVpc(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -536,6 +539,7 @@ func TestAccAWSMqBroker_allFieldsCustomVpc(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -647,6 +651,7 @@ func TestAccAWSMqBroker_EncryptionOptions_KmsKeyId(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -680,6 +685,7 @@ func TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Disabled(t *testing.T)
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -712,6 +718,7 @@ func TestAccAWSMqBroker_EncryptionOptions_UseAwsOwnedKey_Enabled(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -744,6 +751,7 @@ func TestAccAWSMqBroker_updateUsers(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -816,6 +824,7 @@ func TestAccAWSMqBroker_tags(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -865,6 +874,7 @@ func TestAccAWSMqBroker_updateSecurityGroup(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -917,6 +927,7 @@ func TestAccAWSMqBroker_updateEngineVersion(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -955,6 +966,7 @@ func TestAccAWSMqBroker_disappears(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -981,6 +993,7 @@ func TestAccAWSMqBroker_rabbitmq(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -1018,6 +1031,7 @@ func TestAccAWSMqBroker_clusterRabbitMQ(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
@@ -1078,6 +1092,7 @@ func TestAccAWSMqBroker_ldap(t *testing.T) {
 			testAccPartitionHasServicePreCheck(mq.EndpointsID, t)
 			testAccPreCheckAWSMq(t)
 		},
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqBrokerDestroy,
 		Steps: []resource.TestStep{
diff --git a/aws/resource_aws_mq_configuration_test.go b/aws/resource_aws_mq_configuration_test.go
index 8d3c507fc7d..b013163bfff 100644
--- a/aws/resource_aws_mq_configuration_test.go
+++ b/aws/resource_aws_mq_configuration_test.go
@@ -18,6 +18,7 @@ func TestAccAWSMqConfiguration_basic(t *testing.T) {
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) },
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqConfigurationDestroy,
 		Steps: []resource.TestStep{
@@ -60,6 +61,7 @@ func TestAccAWSMqConfiguration_withData(t *testing.T) {
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) },
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqConfigurationDestroy,
 		Steps: []resource.TestStep{
@@ -90,6 +92,7 @@ func TestAccAWSMqConfiguration_updateTags(t *testing.T) {
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t); testAccPreCheckAWSMq(t) },
+		ErrorCheck:   testAccErrorCheck(t, mq.EndpointsID),
 		Providers:    testAccProviders,
 		CheckDestroy: testAccCheckAwsMqConfigurationDestroy,
 		Steps: []resource.TestStep{