diff --git a/builtin/providers/aws/resource_aws_internet_gateway_test.go b/builtin/providers/aws/resource_aws_internet_gateway_test.go
index 094a923ad..d38324d70 100644
--- a/builtin/providers/aws/resource_aws_internet_gateway_test.go
+++ b/builtin/providers/aws/resource_aws_internet_gateway_test.go
@@ -2,7 +2,6 @@ package aws
 
 import (
 	"fmt"
-	"log"
 	"testing"
 
 	"github.com/hashicorp/terraform/helper/resource"
diff --git a/builtin/providers/aws/resource_aws_subnet_test.go b/builtin/providers/aws/resource_aws_subnet_test.go
new file mode 100644
index 000000000..5016149ad
--- /dev/null
+++ b/builtin/providers/aws/resource_aws_subnet_test.go
@@ -0,0 +1,108 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+	"github.com/mitchellh/goamz/ec2"
+)
+
+func TestAccAWSSubnet(t *testing.T) {
+	var v ec2.Subnet
+
+	testCheck := func(*terraform.State) error {
+		if v.CidrBlock != "10.1.1.0/24" {
+			return fmt.Errorf("bad cidr: %s", v.CidrBlock)
+		}
+
+		return nil
+	}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckSubnetDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccSubnetConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckSubnetExists(
+						"aws_subnet.foo", &v),
+					testCheck,
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckSubnetDestroy(s *terraform.State) error {
+	conn := testAccProvider.ec2conn
+
+	for _, rs := range s.Resources {
+		if rs.Type != "aws_subnet" {
+			continue
+		}
+
+		// Try to find the resource
+		resp, err := conn.DescribeSubnets(
+			[]string{rs.ID}, ec2.NewFilter())
+		if err == nil {
+			if len(resp.Subnets) > 0 {
+				return fmt.Errorf("still exist.")
+			}
+
+			return nil
+		}
+
+		// Verify the error is what we want
+		ec2err, ok := err.(*ec2.Error)
+		if !ok {
+			return err
+		}
+		if ec2err.Code != "InvalidSubnetID.NotFound" {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func testAccCheckSubnetExists(n string, v *ec2.Subnet) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found: %s", n)
+		}
+
+		if rs.ID == "" {
+			return fmt.Errorf("No ID is set")
+		}
+
+		conn := testAccProvider.ec2conn
+		resp, err := conn.DescribeSubnets(
+			[]string{rs.ID}, ec2.NewFilter())
+		if err != nil {
+			return err
+		}
+		if len(resp.Subnets) == 0 {
+			return fmt.Errorf("Subnet not found")
+		}
+
+		*v = resp.Subnets[0]
+
+		return nil
+	}
+}
+
+const testAccSubnetConfig = `
+resource "aws_vpc" "foo" {
+	cidr_block = "10.1.0.0/16"
+}
+
+resource "aws_subnet" "foo" {
+	cidr_block = "10.1.1.0/24"
+	vpc_id = "${aws_vpc.foo.id}"
+}
+`