diff --git a/builtin/providers/aws/resource_aws_ami_test.go b/builtin/providers/aws/resource_aws_ami_test.go
index cf34187f1..2f2e481a4 100644
--- a/builtin/providers/aws/resource_aws_ami_test.go
+++ b/builtin/providers/aws/resource_aws_ami_test.go
@@ -82,6 +82,10 @@ func testAccCheckAmiDestroy(s *terraform.State) error {
 		}
 		resp, err := conn.DescribeImages(DescribeAmiOpts)
 		if err != nil {
+			if isAWSErr(err, "InvalidAMIID", "NotFound") {
+				log.Printf("[DEBUG] AMI not found, passing")
+				return nil
+			}
 			return err
 		}
 
@@ -183,7 +187,7 @@ resource "aws_ebs_volume" "foo" {
  	availability_zone = "us-west-2a"
  	size = 8
  	tags {
- 	  Name = "tf-acc-test"
+ 	  Name = "testAccAmiConfig_basic"
  	}
 }
 
@@ -209,7 +213,7 @@ resource "aws_ebs_volume" "foo" {
  	availability_zone = "us-west-2a"
  	size = 20
  	tags {
- 	  Name = "tf-acc-test"
+ 	  Name = "testAccAmiConfig_snapshotSize"
  	}
 }