diff --git a/builtin/providers/aws/resource_aws_ami_from_instance_test.go b/builtin/providers/aws/resource_aws_ami_from_instance_test.go
index a81dc1f8cf..e7ead234f6 100644
--- a/builtin/providers/aws/resource_aws_ami_from_instance_test.go
+++ b/builtin/providers/aws/resource_aws_ami_from_instance_test.go
@@ -147,6 +147,9 @@ resource "aws_instance" "test" {
     // one snapshot in our created AMI.
     ami = "ami-408c7f28"
     instance_type = "t1.micro"
+		tags {
+			Name = "testAccAWSAMIFromInstanceConfig_TestAMI"
+		}
 }
 
 resource "aws_ami_from_instance" "test" {
diff --git a/builtin/providers/aws/resource_aws_instance_test.go b/builtin/providers/aws/resource_aws_instance_test.go
index c19ddc0e43..0efcd5fe8b 100644
--- a/builtin/providers/aws/resource_aws_instance_test.go
+++ b/builtin/providers/aws/resource_aws_instance_test.go
@@ -1045,6 +1045,9 @@ resource "aws_instance" "foo" {
   ami = "ami-408c7f28"
   instance_type = "t1.micro"
   key_name = "${aws_key_pair.debugging.key_name}"
+	tags {
+		Name = "testAccInstanceConfigKeyPair_TestAMI"
+	}
 }
 `