diff --git a/test/e2e/settings/custom_header.go b/test/e2e/settings/custom_header.go
new file mode 100644
index 000000000..33a3fd7d1
--- /dev/null
+++ b/test/e2e/settings/custom_header.go
@@ -0,0 +1,103 @@
+/*
+Copyright 2020 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 settings
+
+import (
+	"fmt"
+	"net/http"
+	"strings"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	"github.com/parnurzeal/gorequest"
+
+	"k8s.io/ingress-nginx/test/e2e/framework"
+)
+
+var _ = framework.IngressNginxDescribe("Add custom header", func() {
+	f := framework.NewDefaultFramework("custom-header")
+	host := "custom-header"
+
+	BeforeEach(func() {
+		f.NewEchoDeployment()
+		ing := framework.NewSingleIngress(host, "/", host, f.Namespace, framework.EchoService, 80, nil)
+		f.EnsureIngress(ing)
+	})
+
+	AfterEach(func() {
+	})
+
+	It("Add a custom header", func() {
+		customHeader := "X-A-Custom-Header"
+		customHeaderValue := "customHeaderValue"
+
+		h := make(map[string]string)
+		h[customHeader] = customHeaderValue
+
+		f.CreateConfigMap("add-headers-configmap", h)
+
+		wlKey := "add-headers"
+		wlValue := f.Namespace + "/add-headers-configmap"
+
+		f.UpdateNginxConfigMapData(wlKey, wlValue)
+
+		f.WaitForNginxConfiguration(func(server string) bool {
+			return strings.Contains(server, fmt.Sprintf("more_set_headers \"%s: %s\";", customHeader, customHeaderValue))
+		})
+
+		resp, _, errs := gorequest.New().
+			Get(f.GetURL(framework.HTTP)).
+			Set("Host", host).
+			End()
+
+		Expect(errs).Should(BeEmpty())
+		Expect(resp.StatusCode).Should(Equal(http.StatusOK))
+		Expect(resp.Header.Get(customHeader)).Should(ContainSubstring(customHeaderValue))
+	})
+
+	It("Add multiple custom headers", func() {
+		firstCustomHeader := "X-First"
+		firstCustomHeaderValue := "Prepare for trouble!"
+		secondCustomHeader := "X-Second"
+		secondCustomHeaderValue := "And make it double!"
+
+		h := make(map[string]string)
+		h[firstCustomHeader] = firstCustomHeaderValue
+		h[secondCustomHeader] = secondCustomHeaderValue
+
+		f.CreateConfigMap("add-headers-configmap-two", h)
+
+		wlKey := "add-headers"
+		wlValue := f.Namespace + "/add-headers-configmap-two"
+
+		f.UpdateNginxConfigMapData(wlKey, wlValue)
+
+		f.WaitForNginxConfiguration(func(server string) bool {
+			return strings.Contains(server, fmt.Sprintf("more_set_headers \"%s: %s\";", firstCustomHeader, firstCustomHeaderValue)) && strings.Contains(server, fmt.Sprintf("more_set_headers \"%s: %s\";", secondCustomHeader, secondCustomHeaderValue))
+		})
+
+		resp, _, errs := gorequest.New().
+			Get(f.GetURL(framework.HTTP)).
+			Set("Host", host).
+			End()
+
+		Expect(errs).Should(BeEmpty())
+		Expect(resp.StatusCode).Should(Equal(http.StatusOK))
+		Expect(resp.Header.Get(firstCustomHeader)).Should(ContainSubstring(firstCustomHeaderValue))
+		Expect(resp.Header.Get(secondCustomHeader)).Should(ContainSubstring(secondCustomHeaderValue))
+	})
+})