diff --git a/builtin/providers/aws/resource_aws_vpn_connection_test.go b/builtin/providers/aws/resource_aws_vpn_connection_test.go
new file mode 100644
index 000000000..e416606a9
--- /dev/null
+++ b/builtin/providers/aws/resource_aws_vpn_connection_test.go
@@ -0,0 +1,138 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/awslabs/aws-sdk-go/aws"
+	"github.com/awslabs/aws-sdk-go/service/ec2"
+
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccAwsVpnConnection(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccAwsVpnConnectionDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccAwsVpnConnectionConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testAccAwsVpnConnection(
+						"aws_vpc.vpc",
+						"aws_vpn_gateway.vpn_gateway",
+						"aws_customer_gateway.customer_gateway",
+						"aws_vpn_connection.foo",
+					),
+				),
+			},
+			resource.TestStep{
+				Config: testAccAwsVpnConnectionConfigUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					testAccAwsVpnConnection(
+						"aws_vpc.vpc",
+						"aws_vpn_gateway.vpn_gateway",
+						"aws_customer_gateway.customer_gateway",
+						"aws_vpn_connection.bar",
+					),
+				),
+			},
+		},
+	})
+}
+
+func testAccAwsVpnConnectionDestroy(s *terraform.State) error {
+	if len(s.RootModule().Resources) > 0 {
+		return fmt.Errorf("Expected all resources to be gone, but found: %#v", s.RootModule().Resources)
+	}
+
+	return nil
+}
+
+func testAccAwsVpnConnection(
+	vpcResource string,
+	vpnGatewayResource string,
+	customerGatewayResource string,
+	vpnConnectionResource string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[vpnConnectionResource]
+		if !ok {
+			return fmt.Errorf("Not found: %s", vpnConnectionResource)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No ID is set")
+		}
+		connection, ok := s.RootModule().Resources[vpnConnectionResource]
+		if !ok {
+			return fmt.Errorf("Not found: %s", vpnConnectionResource)
+		}
+
+		ec2conn := testAccProvider.Meta().(*AWSClient).ec2conn
+
+		_, err := ec2conn.DescribeVPNConnections(&ec2.DescribeVPNConnectionsInput{
+			VPNConnectionIDs: []*string{aws.String(connection.Primary.ID)},
+		})
+
+		if err != nil {
+			return err
+		}
+
+		return nil
+	}
+}
+
+const testAccAwsVpnConnectionConfig = `
+resource "aws_vpc" "vpc" {
+	cidr_block = "10.0.0.0/16"
+}
+
+resource "aws_vpn_gateway" "vpn_gateway" {
+	vpc_id = "${aws_vpc.vpc.id}"
+}
+
+resource "aws_customer_gateway" "customer_gateway" {
+	bgp_asn = 60000
+	ip_address = "172.0.0.1"
+	type = ipsec.1
+}
+
+resource "aws_vpn_connection" "foo" {
+	vpn_gateway_id = "${aws_vpn_gateway.vpn_gateway.id}"
+	customer_gateway_id = "${aws_customer_gateway.customer_gateway.id}"
+	type = "ipsec.1"
+	static_routes_only = true
+}
+`
+
+const testAccAwsVpnConnectionConfigUpdate = `
+resource "aws_vpc" "vpc" {
+	cidr_block = "10.0.0.0/16"
+}
+
+resource "aws_vpn_gateway" "vpn_gateway" {
+	vpc_id = "${aws_vpc.vpc.id}"
+}
+
+resource "aws_customer_gateway" "customer_gateway" {
+	bgp_asn = 60000
+	ip_address = "172.0.0.1"
+	type = ipsec.1
+}
+
+resource "aws_vpn_connection" "foo" {
+	vpn_gateway_id = "${aws_vpn_gateway.vpn_gateway.id}"
+	customer_gateway_id = "${aws_customer_gateway.customer_gateway.id}"
+	type = "ipsec.1"
+	static_routes_only = true
+}
+
+resource "aws_vpn_connection" "bar" {
+	vpn_gateway_id = "${aws_vpn_gateway.vpn_gateway.id}"
+	customer_gateway_id = "${aws_customer_gateway.customer_gateway.id}"
+	type = "ipsec.1"
+	static_routes_only = false
+}
+`