diff --git a/Makefile b/Makefile
index aaed30f9..ca01fa12 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,22 @@ generate-accounts:
 
 run:
 	# Run containers
+	docker run -d --name mail_hostoverride \
+		-v "`pwd`/test/config":/tmp/docker-mailserver \
+		-v "`pwd`/test":/tmp/docker-mailserver-test \
+		-v "`pwd`/test/onedir":/var/mail-state \
+		-e OVERRIDE_HOSTNAME=mail.my-domain.com \
+		-e ENABLE_CLAMAV=1 \
+		-e ENABLE_SPAMASSASSIN=1 \
+		-e SA_TAG=1.0 \
+		-e SA_TAG2=2.0 \
+		-e SA_KILL=3.0 \
+		-e VIRUSMAILS_DELETE_DELAY=7 \
+		-e SASL_PASSWD="external-domain.com username:password" \
+		-e ENABLE_MANAGESIEVE=1 \
+		-e PERMIT_DOCKER=host \
+		-e DMS_DEBUG=0 \
+		-t $(NAME)
 	docker run -d --name mail \
 		-v "`pwd`/test/config":/tmp/docker-mailserver \
 		-v "`pwd`/test":/tmp/docker-mailserver-test \
diff --git a/test/tests.bats b/test/tests.bats
index 45e9a63f..1dfe5359 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -9,6 +9,11 @@ load 'test_helper/bats-assert/load'
   assert_failure
 }
 
+@test "checking configuration: hostname/domainname override" {
+  run docker exec mail_hostoverride /bin/bash -c "cat /etc/mailname | grep my-domain.com"
+  assert_success
+}
+
 #
 # processes
 #