diff --git a/.travis.yml b/.travis.yml
index e86c6a30..542b4edc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ script:
 after_script:
   - make clean
 env:
-  - ENABLE_POP3=0
+  - ENABLE_POP3=0 
   - ENABLE_POP3=1
   # - ENABLE_FAIL2BAN=0
   # - ENABLE_FAIL2BAN=1
@@ -17,8 +17,8 @@ env:
   # - ENABLE_MANAGESIEVE=1
   # - SMTP_ONLY=0
   # - SMTP_ONLY=1
-  - SASL_PASSWD=
-  - SASL_PASSWD="external-domain.com username:password"
+  # - SASL_PASSWD=
+  # - SASL_PASSWD="external-domain.com username:password"
   # - ONE_DIR=0
   # - ONE_DIR=1
   # - SA_TAG=
diff --git a/Makefile b/Makefile
index 39ea1771..6fa91aa7 100644
--- a/Makefile
+++ b/Makefile
@@ -55,14 +55,15 @@ fixtures:
 
 tests:
 # Start tests
-ifdef ENABLE_POP3
-	@echo "ENABLE_POP3 => $(ENABLE_POP3)"
-	./test/bats/bats test/ENABLE_POP3_$(ENABLE_POP3).bats
-endif
-ifdef SASL_PASSWD
-	@echo "SASL_PASSWD => $(SASL_PASSWD)"
-	./test/bats/bats test/SASL_PASSWD_$(SASL_PASSWD_).bats
-endif
+# ifdef ENABLE_POP3
+# 	@echo "ENABLE_POP3 => $(ENABLE_POP3)"
+# 	./test/bats/bats test/ENABLE_POP3_$(ENABLE_POP3).bats
+# endif
+# ifdef SASL_PASSWD
+# 	@echo "SASL_PASSWD => $(SASL_PASSWD)"
+# 	./test/bats/bats test/SASL_PASSWD_$(SASL_PASSWD_).bats
+# endif
+	./test/bats/bats test/ENABLE_POP3.bats
 
 clean:
 	# Remove running test container
diff --git a/test/ENABLE_POP3_1.bats b/test/ENABLE_POP3_1.bats
index ccf13b0b..03eec3b3 100644
--- a/test/ENABLE_POP3_1.bats
+++ b/test/ENABLE_POP3_1.bats
@@ -1,4 +1,4 @@
-@test "checking process: process is running" {
+@test "checking pop: process is running" {
   run docker exec mail /bin/bash -c "ps aux | grep 'dovecot/pop'"
   [ "$status" -eq 0 ]
 }