diff --git a/Makefile b/Makefile
index 3979a268..6a2b8df6 100644
--- a/Makefile
+++ b/Makefile
@@ -54,9 +54,8 @@ fixtures:
 	sleep 10
 
 tests:
-# Start tests
-	./test/bats/bats test/ENABLE_POP3.bats
-	./test/bats/bats test/SASL_PASSWD.bats
+	# Start tests
+	./test/bats/bats test/*.bats
 
 clean:
 	# Remove running test container
diff --git a/test/tests.bats b/test/tests._bats
similarity index 100%
rename from test/tests.bats
rename to test/tests._bats