diff --git a/builder/amazon/common/ami_config_test.go b/builder/amazon/common/ami_config_test.go
index 9e2baa41d..1e8ecc9f1 100644
--- a/builder/amazon/common/ami_config_test.go
+++ b/builder/amazon/common/ami_config_test.go
@@ -30,6 +30,13 @@ func TestAMIConfigPrepare_regions(t *testing.T) {
 		t.Fatalf("shouldn't have err: %s", err)
 	}
 
+	c.AMIRegions = []string{"ap-northeast-1", "ap-northeast-2", "ap-southeast-1",
+		"ap-southeast-2", "cn-north-1", "eu-central-1", "eu-west-1", "sa-east-1",
+		"us-east-1", "us-gov-west-1", "us-west-1", "us-west-2"}
+	if err := c.Prepare(nil); err != nil {
+		t.Fatalf("shouldn't have err: %s", err)
+	}
+
 	c.AMIRegions = []string{"foo"}
 	if err := c.Prepare(nil); err == nil {
 		t.Fatal("should have error")
diff --git a/builder/amazon/common/regions.go b/builder/amazon/common/regions.go
index 4d3762465..2096a715a 100644
--- a/builder/amazon/common/regions.go
+++ b/builder/amazon/common/regions.go
@@ -1,11 +1,22 @@
 package common
 
-// IsValidRegion returns true if the supplied region is a valid AWS
+// ValidateRegion returns true if the supplied region is a valid AWS
 // region and false if it's not.
 func ValidateRegion(region string) bool {
-	var regions = [11]string{"us-east-1", "us-west-2", "us-west-1", "eu-west-1",
-		"eu-central-1", "ap-southeast-1", "ap-southeast-2", "ap-northeast-1",
-		"sa-east-1", "cn-north-1", "us-gov-west-1"}
+	var regions = [12]string{
+		"ap-northeast-1",
+		"ap-northeast-2",
+		"ap-southeast-1",
+		"ap-southeast-2",
+		"cn-north-1",
+		"eu-central-1",
+		"eu-west-1",
+		"sa-east-1",
+		"us-east-1",
+		"us-gov-west-1",
+		"us-west-1",
+		"us-west-2",
+	}
 
 	for _, valid := range regions {
 		if region == valid {