diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go
index 73d17c45f..0a255fe6c 100644
--- a/builder/amazon/common/block_device.go
+++ b/builder/amazon/common/block_device.go
@@ -30,7 +30,7 @@ func buildBlockDevices(b []BlockDevice) []*ec2.BlockDeviceMapping {
 	var blockDevices []*ec2.BlockDeviceMapping
 
 	for _, blockDevice := range b {
-		mapping := &ec2.BlockDeviceMapping {
+		mapping := &ec2.BlockDeviceMapping{
 			DeviceName: aws.String(blockDevice.DeviceName),
 		}
 
diff --git a/builder/amazon/common/block_device_test.go b/builder/amazon/common/block_device_test.go
index d0a9c0cb5..e9fdb6c0f 100644
--- a/builder/amazon/common/block_device_test.go
+++ b/builder/amazon/common/block_device_test.go
@@ -23,7 +23,7 @@ func TestBlockDevice(t *testing.T) {
 			},
 
 			Result: &ec2.BlockDeviceMapping{
-				DeviceName:  aws.String("/dev/sdb"),
+				DeviceName: aws.String("/dev/sdb"),
 				Ebs: &ec2.EbsBlockDevice{
 					SnapshotId:          aws.String("snap-1234"),
 					VolumeType:          aws.String("standard"),
@@ -39,7 +39,7 @@ func TestBlockDevice(t *testing.T) {
 			},
 
 			Result: &ec2.BlockDeviceMapping{
-				DeviceName:  aws.String("/dev/sdb"),
+				DeviceName: aws.String("/dev/sdb"),
 				Ebs: &ec2.EbsBlockDevice{
 					VolumeSize:          aws.Int64(8),
 					DeleteOnTermination: aws.Bool(false),
@@ -56,7 +56,7 @@ func TestBlockDevice(t *testing.T) {
 			},
 
 			Result: &ec2.BlockDeviceMapping{
-				DeviceName:  aws.String("/dev/sdb"),
+				DeviceName: aws.String("/dev/sdb"),
 				Ebs: &ec2.EbsBlockDevice{
 					VolumeType:          aws.String("io1"),
 					VolumeSize:          aws.Int64(8),
@@ -75,7 +75,7 @@ func TestBlockDevice(t *testing.T) {
 			},
 
 			Result: &ec2.BlockDeviceMapping{
-				DeviceName:  aws.String("/dev/sdb"),
+				DeviceName: aws.String("/dev/sdb"),
 				Ebs: &ec2.EbsBlockDevice{
 					VolumeType:          aws.String("gp2"),
 					VolumeSize:          aws.Int64(8),
@@ -102,8 +102,8 @@ func TestBlockDevice(t *testing.T) {
 			},
 
 			Result: &ec2.BlockDeviceMapping{
-				DeviceName:  aws.String("/dev/sdb"),
-				NoDevice:    aws.String(""),
+				DeviceName: aws.String("/dev/sdb"),
+				NoDevice:   aws.String(""),
 			},
 		},
 	}