diff --git a/builder/amazon/common/block_device_test.go b/builder/amazon/common/block_device_test.go
index b99a22747..063c480f1 100644
--- a/builder/amazon/common/block_device_test.go
+++ b/builder/amazon/common/block_device_test.go
@@ -46,7 +46,6 @@ func TestBlockDevice(t *testing.T) {
 				DeviceName:  aws.String("/dev/sdb"),
 				VirtualName: aws.String(""),
 				EBS: &ec2.EBSBlockDevice{
-					Encrypted:           aws.Boolean(false),
 					VolumeType:          aws.String(""),
 					VolumeSize:          aws.Long(8),
 					DeleteOnTermination: aws.Boolean(false),
@@ -67,7 +66,6 @@ func TestBlockDevice(t *testing.T) {
 				DeviceName:  aws.String("/dev/sdb"),
 				VirtualName: aws.String("ephemeral0"),
 				EBS: &ec2.EBSBlockDevice{
-					Encrypted:           aws.Boolean(false),
 					VolumeType:          aws.String("io1"),
 					VolumeSize:          aws.Long(8),
 					DeleteOnTermination: aws.Boolean(true),
diff --git a/common/download.go b/common/download.go
index 6cd2a7a15..6b346f99d 100644
--- a/common/download.go
+++ b/common/download.go
@@ -136,10 +136,10 @@ func (d *DownloadClient) Get() (string, error) {
 		if err != nil {
 			return "", err
 		}
-		defer f.Close()
 
 		log.Printf("Downloading: %s", url.String())
 		err = d.downloader.Download(f, url)
+		f.Close()
 		if err != nil {
 			return "", err
 		}
@@ -149,7 +149,12 @@ func (d *DownloadClient) Get() (string, error) {
 		var verify bool
 		verify, err = d.VerifyChecksum(finalPath)
 		if err == nil && !verify {
-			err = fmt.Errorf("checksums didn't match expected: %s", hex.EncodeToString(d.config.Checksum))
+			// Delete the file
+			os.Remove(finalPath)
+
+			err = fmt.Errorf(
+				"checksums didn't match expected: %s",
+				hex.EncodeToString(d.config.Checksum))
 		}
 	}