diff --git a/test/test_http_port.py b/test/test_http_port.py
index 26302c5..0bd6bb4 100644
--- a/test/test_http_port.py
+++ b/test/test_http_port.py
@@ -5,4 +5,9 @@ import pytest
 def test_web1_http_custom_port(docker_compose, nginxproxy, subdomain):
     r = nginxproxy.get("http://%s.nginx-proxy.tld:8080/port" % subdomain, allow_redirects=False)
     assert r.status_code == 200
-    assert "answer from port 81\n" in r.text
\ No newline at end of file
+    assert "answer from port 81\n" in r.text
+
+def test_nonstandardport_Host_header(docker_compose, nginxproxy):
+    r = nginxproxy.get("http://web.nginx-proxy.tld:8080/headers")
+    assert r.status_code == 200
+    assert "Host: web.nginx-proxy.tld:8080" in r.text
diff --git a/test/test_ssl/test_https_port.py b/test/test_ssl/test_https_port.py
index 214d4d9..27a42ef 100644
--- a/test/test_ssl/test_https_port.py
+++ b/test/test_ssl/test_https_port.py
@@ -11,4 +11,9 @@ def test_web1_http_redirects_to_https(docker_compose, nginxproxy, subdomain):
 def test_web1_https_is_forwarded(docker_compose, nginxproxy, subdomain):
     r = nginxproxy.get("https://%s.nginx-proxy.tld:8443/port" % subdomain, allow_redirects=False)
     assert r.status_code == 200
-    assert "answer from port 81\n" in r.text
\ No newline at end of file
+    assert "answer from port 81\n" in r.text
+
+def test_nonstandardport_Host_header(docker_compose, nginxproxy):
+    r = nginxproxy.get("https://web.nginx-proxy.tld:8443/headers")
+    assert r.status_code == 200
+    assert "Host: web.nginx-proxy.tld:8443" in r.text