diff --git a/builtin/providers/aws/resource_aws_proxy_protocol_policy_test.go b/builtin/providers/aws/resource_aws_proxy_protocol_policy_test.go
new file mode 100644
index 000000000..d03cfd7eb
--- /dev/null
+++ b/builtin/providers/aws/resource_aws_proxy_protocol_policy_test.go
@@ -0,0 +1,103 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccAWSProxyProtocolPolicy(t *testing.T) {
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckProxyProtocolPolicyDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccProxyProtocolPolicyConfig,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"aws_proxy_protocol_policy.smtp", "load_balancer", "test-lb"),
+					resource.TestCheckResourceAttr(
+						"aws_proxy_protocol_policy.smtp", "instance_ports.#", "1"),
+					resource.TestCheckResourceAttr(
+						"aws_proxy_protocol_policy.smtp", "instance_ports.4196041389", "25"),
+				),
+			},
+			resource.TestStep{
+				Config: testAccProxyProtocolPolicyConfigUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"aws_proxy_protocol_policy.smtp", "load_balancer", "test-lb"),
+					resource.TestCheckResourceAttr(
+						"aws_proxy_protocol_policy.smtp", "instance_ports.#", "2"),
+					resource.TestCheckResourceAttr(
+						"aws_proxy_protocol_policy.smtp", "instance_ports.4196041389", "25"),
+					resource.TestCheckResourceAttr(
+						"aws_proxy_protocol_policy.smtp", "instance_ports.1925441437", "587"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckProxyProtocolPolicyDestroy(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
+}
+
+const testAccProxyProtocolPolicyConfig = `
+resource "aws_elb" "lb" {
+	name = "test-lb"
+	availability_zones = ["us-west-2a"]
+
+	listener {
+		instance_port = 25
+		instance_protocol = "tcp"
+		lb_port = 25
+		lb_protocol = "tcp"
+	}
+
+	listener {
+		instance_port = 587
+		instance_protocol = "tcp"
+		lb_port = 587
+		lb_protocol = "tcp"
+	}
+}
+
+resource "aws_proxy_protocol_policy" "smtp" {
+	load_balancer = "${aws_elb.lb.name}"
+	instance_ports = ["25"]
+}
+`
+
+const testAccProxyProtocolPolicyConfigUpdate = `
+resource "aws_elb" "lb" {
+	name = "test-lb"
+	availability_zones = ["us-west-2a"]
+
+	listener {
+		instance_port = 25
+		instance_protocol = "tcp"
+		lb_port = 25
+		lb_protocol = "tcp"
+	}
+
+	listener {
+		instance_port = 587
+		instance_protocol = "tcp"
+		lb_port = 587
+		lb_protocol = "tcp"
+	}
+}
+
+resource "aws_proxy_protocol_policy" "smtp" {
+	load_balancer = "${aws_elb.lb.name}"
+	instance_ports = ["25", "587"]
+}
+`