diff --git a/Makefile b/Makefile
index ca01fa12..ee5342f2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,22 +18,6 @@ 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 \
@@ -63,8 +47,9 @@ run:
 		-v "`pwd`/test/config":/tmp/docker-mailserver \
 		-v "`pwd`/test":/tmp/docker-mailserver-test \
 		-e SMTP_ONLY=1 \
-		-e PERMIT_DOCKER=network\
-		-h mail.my-domain.com -t $(NAME)
+		-e PERMIT_DOCKER=network \
+		-e OVERRIDE_HOSTNAME=mail.my-domain.com \
+		-t $(NAME)
 	sleep 15
 	docker run -d --name mail_fail2ban \
 		-v "`pwd`/test/config":/tmp/docker-mailserver \
diff --git a/test/tests.bats b/test/tests.bats
index 1dfe5359..d69fc253 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -10,7 +10,7 @@ load 'test_helper/bats-assert/load'
 }
 
 @test "checking configuration: hostname/domainname override" {
-  run docker exec mail_hostoverride /bin/bash -c "cat /etc/mailname | grep my-domain.com"
+  run docker exec mail_smtponly /bin/bash -c "cat /etc/mailname | grep my-domain.com"
   assert_success
 }