diff --git a/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go b/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go
new file mode 100644
index 000000000000..3846fb68ea3d
--- /dev/null
+++ b/builtin/providers/aws/resource_aws_app_cookie_stickiness_policy_test.go
@@ -0,0 +1,125 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/awslabs/aws-sdk-go/aws"
+	"github.com/awslabs/aws-sdk-go/service/elb"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccAWSAppCookieStickinessPolicy(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAppCookieStickinessPolicyDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccAppCookieStickinessPolicyConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAppCookieStickinessPolicy(
+						"aws_elb.lb",
+						"aws_app_cookie_stickiness_policy.foo",
+					),
+				),
+			},
+			resource.TestStep{
+				Config: testAccAppCookieStickinessPolicyConfigUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAppCookieStickinessPolicy(
+						"aws_elb.lb",
+						"aws_app_cookie_stickiness_policy.bar",
+					),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckAppCookieStickinessPolicyDestroy(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 testAccCheckAppCookieStickinessPolicy(elbResource string, policyResource string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[elbResource]
+		if !ok {
+			return fmt.Errorf("Not found: %s", elbResource)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No ID is set")
+		}
+
+		policy, ok := s.RootModule().Resources[policyResource]
+		if !ok {
+			return fmt.Errorf("Not found: %s", policyResource)
+		}
+
+		elbconn := testAccProvider.Meta().(*AWSClient).elbconn
+		elbName, _, policyName := resourceAwsAppCookieStickinessPolicyParseId(policy.Primary.ID)
+		_, err := elbconn.DescribeLoadBalancerPolicies(&elb.DescribeLoadBalancerPoliciesInput{
+			LoadBalancerName: aws.String(elbName),
+			PolicyNames:      []*string{aws.String(policyName)},
+		})
+
+		if err != nil {
+			return err
+		}
+
+		return nil
+	}
+}
+
+const testAccAppCookieStickinessPolicyConfig = `
+resource "aws_elb" "lb" {
+	name = "test-lb"
+	availability_zones = ["us-east-1a"]
+	listener {
+		instance_port = 8000
+		instance_protocol = "http"
+		lb_port = 80
+		lb_protocol = "http"
+	}
+}
+
+resource "aws_app_cookie_stickiness_policy" "foo" {
+	name = "foo_policy"
+	load_balancer = "${aws_elb.lb}"
+	lb_port = 80
+	cookie_name = "MyAppCookie"
+}
+`
+
+const testAccAppCookieStickinessPolicyConfigUpdate = `
+resource "aws_elb" "lb" {
+	name = "test-lb"
+	availability_zones = ["us-east-1a"]
+	listener {
+		instance_port = 8000
+		instance_protocol = "http"
+		lb_port = 80
+		lb_protocol = "http"
+	}
+}
+
+resource "aws_app_cookie_stickiness_policy" "foo" {
+	name = "foo_policy"
+	load_balancer = "${aws_elb.lb}"
+	lb_port = 80
+	cookie_name = "MyAppCookie"
+}
+
+resource "aws_app_cookie_stickiness_policy" "bar" {
+	name = "bar_policy"
+	load_balancer = "${aws_elb.lb}"
+	lb_port = 80
+	cookie_name = "MyAppCookie"
+}
+`