diff --git a/aws/resource_aws_network_interface_test.go b/aws/resource_aws_network_interface_test.go
index 0c3cc7f615c5..fb2cd03353b2 100644
--- a/aws/resource_aws_network_interface_test.go
+++ b/aws/resource_aws_network_interface_test.go
@@ -892,7 +892,7 @@ resource "aws_network_interface" "test" {
 }
 
 func testAccAWSENITagsConfig1(rName, tagKey1, tagValue1 string) string {
-	return fmt.Sprintf(`
+	return testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
 resource "aws_vpc" "test" {
   cidr_block           = "172.16.0.0/16"
   enable_dns_hostnames = true
@@ -902,15 +902,6 @@ resource "aws_vpc" "test" {
   }
 }
 
-data "aws_availability_zones" "available" {
-   state = "available"
-
-   filter {
-     name   = "opt-in-status"
-     values = ["opt-in-not-required"]
-   }
- }
-
 resource "aws_subnet" "test" {
   vpc_id            = aws_vpc.test.id
   cidr_block        = "172.16.10.0/24"
@@ -952,7 +943,7 @@ resource "aws_network_interface" "test" {
 }
 
 func testAccAWSENITagsConfig2(rName, tagKey1, tagValue1, tagKey2, tagValue2 string) string {
-	return fmt.Sprintf(`
+	return testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
 resource "aws_vpc" "test" {
   cidr_block           = "172.16.0.0/16"
   enable_dns_hostnames = true
@@ -962,15 +953,6 @@ resource "aws_vpc" "test" {
   }
 }
 
-data "aws_availability_zones" "available" {
-   state = "available"
-
-   filter {
-     name   = "opt-in-status"
-     values = ["opt-in-not-required"]
-   }
- }
-
 resource "aws_subnet" "test" {
   vpc_id            = aws_vpc.test.id
   cidr_block        = "172.16.10.0/24"