diff --git a/.travis.yml b/.travis.yml
index d29210b1..2fd4fc9d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,8 +12,8 @@ script:
 after_script:
 - make clean
 env:
-- ENABLE_CLAMAV=1 ENABLE_SPAMASSASSIN=1 ENABLE_FAIL2BAN=1 ONE_DIR=1 ENABLE_POP3=1 SA_TAG=1.0 SA_TAG2=2.0 SA_KILL=3.0 VIRUSMAILS_DELETE_DELAY=7 ENABLE_MANAGESIEVE=1 ENABLE_FETCHMAIL= 1 PERMIT_DOCKER=host    DMS_DEBUG=0 SASL_PASSWD="external domain.com username:password"
-- ENABLE_CLAMAV=0 ENABLE_SPAMASSASSIN=0 ENABLE_FAIL2BAN=0 ONE_DIR=0 ENABLE_POP3=0 SA_TAG=    SA_TAG2=    SA_KILL=    VIRUSMAILS_DELETE_DELAY=  ENABLE_MANAGESIEVE=0 ENABLE_FETCHMAIL= 0 PERMIT_DOCKER=network DMS_DEBUG=0
+- ENABLE_CLAMAV=1 ENABLE_SPAMASSASSIN=1 ENABLE_FAIL2BAN=1 ONE_DIR=1 ENABLE_POP3=1 ENABLE_MANAGESIEVE=1 ENABLE_FETCHMAIL= 1 PERMIT_DOCKER=host    DMS_DEBUG=0 SA_TAG=1.0 SA_TAG2=2.0 SA_KILL=3.0 VIRUSMAILS_DELETE_DELAY=7 SASL_PASSWD="external domain.com username:password"
+- ENABLE_CLAMAV=0 ENABLE_SPAMASSASSIN=0 ENABLE_FAIL2BAN=0 ONE_DIR=0 ENABLE_POP3=0 ENABLE_MANAGESIEVE=0 ENABLE_FETCHMAIL= 0 PERMIT_DOCKER=network DMS_DEBUG=1 SA_TAG=    SA_TAG2=    SA_KILL=    VIRUSMAILS_DELETE_DELAY=  
 
 notifications:
   slack:
diff --git a/Makefile b/Makefile
index 6b9f9fd7..67e9c960 100644
--- a/Makefile
+++ b/Makefile
@@ -22,18 +22,22 @@ run:
 		-v "`pwd`/test/config":/tmp/docker-mailserver \
 		-v "`pwd`/test":/tmp/docker-mailserver-test \
 		-v "`pwd`/test/onedir":/var/mail-state \
+		-e ENABLE_CLAMAV=$(ENABLE_CLAMAV) \
+		-e ENABLE_SPAMASSASSIN=$(ENABLE_SPAMASSASSIN) \
 		-e ENABLE_POP3=$(ENABLE_POP3) \
 		-e ENABLE_FAIL2BAN=$(ENABLE_FAIL2BAN) \
 		-e ENABLE_MANAGESIEVE=$(ENABLE_MANAGESIEVE) \
-		-e ENABLE_CLAMAV=$(ENABLE_CLAMAV) \
-		-e ENABLE_SPAMASSASSIN=$(ENABLE_SPAMASSASSIN) \
+		-e ENABLE_FETCHMAIL=$(ENABLE_FETCHMAIL) \
+		-e ONE_DIR=$(ONE_DIR) \
+		-e PERMIT_DOCKER=$(PERMIT_DOCKER) \
 		-e SMTP_ONLY=$(SMTP_ONLY) \
 		-e SA_TAG=$(SA_TAG) \
 		-e SA_TAG2=$(SA_TAG2) \
 		-e SA_KILL=$(SA_KILL) \
+		-e VIRUSMAILS_DELETE_DELAY=$(VIRUSMAILS_DELETE_DELAY) \
 		-e SASL_PASSWD="$(SASL_PASSWD)" \
-		-e ONE_DIR=$(ONE_DIR) \
 		-e DMS_DEBUG=$(DMS_DEBUG) \
+		--cap-add=NET_ADMIN \
 		-h mail.my-domain.com -t $(NAME)
 	# Wait for containers to fully start
 	sleep 15
@@ -66,16 +70,7 @@ tests:
 clean:
 	# Remove running test containers
 	-docker rm -f \
-		mail \
-		mail_pop3 \
-		mail_smtponly \
-		mail_fail2ban \
-		mail_fetchmail \
-		fail-auth-mailer \
-		mail_disabled_clamav_spamassassin \
-		mail_manual_ssl \
-		ldap_for_mail \
-		mail_with_ldap
+		mail
 
 	@if [ -f config/postfix-accounts.cf.bak ]; then\
 		rm -f config/postfix-accounts.cf ;\
diff --git a/test/tests.bats b/test/tests.bats
index cc17cbc4..54053b92 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -358,7 +358,7 @@
 }
 
 @test "checking spamassassin: docker env variables are set correctly (default)" {
-  if [ "$ENABLE_SPAMASSASSIN" -eq 0 -a ! -z $SA_TAG ]; then
+  if [ ! -z $SA_TAG -a ! -z $SA_TAG2 -a ! -z $SA_KILL ]; then
     skip
   fi
   run docker exec mail /bin/sh -c "grep '\$sa_tag_level_deflt' /etc/amavis/conf.d/20-debian_defaults | grep '= 2.0'"
@@ -370,7 +370,7 @@
 }
 
 @test "checking spamassassin: docker env variables are set correctly (custom)" {
-  if [ "$ENABLE_SPAMASSASSIN" -eq 1 -a -z $SA_TAG ]; then
+  if [ -z $SA_TAG -a -z $SA_TAG2 -a -z $SA_KILL ]; then
     skip
   fi
   run docker exec mail /bin/sh -c "grep '\$sa_tag_level_deflt' /etc/amavis/conf.d/20-debian_defaults | grep '= 1.0'"