diff --git a/Makefile b/Makefile
index 116840cc..6f68372d 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,9 @@ fixtures:
 
 tests:
 	# Start tests
-	./test/bats/bats test/tests.bats
+	if [ -z $ENABLE_POP3 ]; then
+		./test/bats/bats test/ENABLE_POP3.bats
+	fi
 
 clean:
 	# Remove running test container