diff --git a/Makefile b/Makefile
index ac35ea35..f904c652 100644
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,13 @@ generate-accounts:
 	docker run --rm -e MAIL_USER=user2@otherdomain.tld -e MAIL_PASS=mypassword -t $(NAME) /bin/sh -c 'echo "$$MAIL_USER|$$(doveadm pw -s SHA512-CRYPT -u $$MAIL_USER -p $$MAIL_PASS)"' >> test/config/postfix-accounts.cf
 
 run:
-  @if [ -z $(ENABLE_LDAP) ]; then\
-		docker run -d --name ldap_for_mail \		
-	 		-e LDAP_DOMAIN="localhost.localdomain" \		
-			-h mail.my-domain.com -t ldap;
-  fi
-	# Run containers
+ifeq ($(ENABLE_LDAP),1)
+	docker run -d --name ldap_for_mail \		
+ 		-e LDAP_DOMAIN="localhost.localdomain" \		
+		-h mail.my-domain.com -t ldap ;
+endif
+
+	Run containers
 	docker run -d --name mail \
 		-v "`pwd`/test/config":/tmp/docker-mailserver \
 		-v "`pwd`/test":/tmp/docker-mailserver-test \
@@ -35,7 +36,7 @@ run:
 		-e ENABLE_FETCHMAIL=$(ENABLE_FETCHMAIL) \
 		-e ONE_DIR=$(ONE_DIR) \
 		-e PERMIT_DOCKER=$(PERMIT_DOCKER) \
-  	-e ENABLE_LDAP=$(ENABLE_LDAP) \		
+		-e ENABLE_LDAP=$(ENABLE_LDAP) \		
 		-e LDAP_SERVER_HOST=$(LDAP_SERVER_HOST) \		
 		-e LDAP_SEARCH_BASE=$(LDAP_SEARCH_BASE) \		
 		-e LDAP_BIND_DN=$(LDAP_BIND_DN) \