diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
index 0982635c92..a2452ad727 100644
--- a/test/e2e/e2e.go
+++ b/test/e2e/e2e.go
@@ -26,9 +26,11 @@ import (
 	"k8s.io/apiserver/pkg/util/logs"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
+	"k8s.io/ingress-nginx/test/e2e/framework"
+
 	_ "k8s.io/ingress-nginx/test/e2e/annotations"
 	_ "k8s.io/ingress-nginx/test/e2e/defaultbackend"
-	"k8s.io/ingress-nginx/test/e2e/framework"
+	_ "k8s.io/ingress-nginx/test/e2e/settings"
 )
 
 // RunE2ETests checks configuration parameters (specified through flags) and then runs
diff --git a/test/e2e/settings/proxy_protocol.go b/test/e2e/settings/proxy_protocol.go
new file mode 100644
index 0000000000..cde00fe209
--- /dev/null
+++ b/test/e2e/settings/proxy_protocol.go
@@ -0,0 +1,130 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package setting
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net"
+	"strings"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"k8s.io/api/extensions/v1beta1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/ingress-nginx/test/e2e/framework"
+)
+
+var _ = framework.IngressNginxDescribe("Proxy Protocol", func() {
+	f := framework.NewDefaultFramework("proxy-protocol")
+
+	BeforeEach(func() {
+		err := f.NewEchoDeployment()
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	AfterEach(func() {
+	})
+
+	It("should respect port passed by the PROXY Protocol", func() {
+		host := "proxy-protocol"
+
+		setting := "use-proxy-protocol"
+		updateConfigmap(setting, "true", f.KubeClientSet)
+		defer updateConfigmap(setting, "false", f.KubeClientSet)
+
+		ing, err := f.EnsureIngress(&v1beta1.Ingress{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:        host,
+				Namespace:   f.Namespace.Name,
+				Annotations: map[string]string{},
+			},
+			Spec: v1beta1.IngressSpec{
+				Rules: []v1beta1.IngressRule{
+					{
+						Host: host,
+						IngressRuleValue: v1beta1.IngressRuleValue{
+							HTTP: &v1beta1.HTTPIngressRuleValue{
+								Paths: []v1beta1.HTTPIngressPath{
+									{
+										Path: "/",
+										Backend: v1beta1.IngressBackend{
+											ServiceName: "http-svc",
+											ServicePort: intstr.FromInt(80),
+										},
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		})
+
+		Expect(err).NotTo(HaveOccurred())
+		Expect(ing).NotTo(BeNil())
+
+		err = f.WaitForNginxServer(host,
+			func(server string) bool {
+				return strings.Contains(server, "server_name proxy-protocol") &&
+					strings.Contains(server, "listen 80 proxy_protocol")
+			})
+		Expect(err).NotTo(HaveOccurred())
+
+		ip, err := f.GetNginxIP()
+		Expect(err).NotTo(HaveOccurred())
+		port, err := f.GetNginxPort("http")
+		Expect(err).NotTo(HaveOccurred())
+
+		conn, err := net.Dial("tcp", fmt.Sprintf("%v:%v", ip, port))
+		Expect(err).NotTo(HaveOccurred())
+		defer conn.Close()
+
+		header := "PROXY TCP4 192.168.0.1 192.168.0.11 56324 1234\r\n"
+		conn.Write([]byte(header))
+		conn.Write([]byte("GET / HTTP/1.1\r\nHost: proxy-protocol\r\n\r\n"))
+
+		data, err := ioutil.ReadAll(conn)
+		Expect(err).NotTo(HaveOccurred())
+		body := string(data)
+		Expect(body).Should(ContainSubstring(fmt.Sprintf("host=%v", "proxy-protocol")))
+		Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-port=80")))
+		Expect(body).Should(ContainSubstring(fmt.Sprintf("x-forwarded-for=192.168.0.1")))
+	})
+})
+
+func updateConfigmap(k, v string, c kubernetes.Interface) {
+	By(fmt.Sprintf("updating configuration configmap setting %v to '%v'", k, v))
+	config, err := c.CoreV1().ConfigMaps("ingress-nginx").Get("nginx-configuration", metav1.GetOptions{})
+	Expect(err).NotTo(HaveOccurred())
+	Expect(config).NotTo(BeNil())
+
+	if config.Data == nil {
+		config.Data = map[string]string{}
+	}
+
+	if config.Data[k] == v {
+		return
+	}
+
+	config.Data[k] = v
+	_, err = c.CoreV1().ConfigMaps("ingress-nginx").Update(config)
+	Expect(err).NotTo(HaveOccurred())
+}