diff --git a/tests/Make-template b/tests/Make-template
index 4a0adb8678c5ea2a5a07ee66564fca99ea44b425..d92003f629f541bc6082faf19ca524d6223b6016 100644
--- a/tests/Make-template
+++ b/tests/Make-template
@@ -17,6 +17,8 @@ SCRIPTSDIR=./scripts
 
 all:	FORCE
 	@echo "Initiating LDAP tests..."; \
+	test -d test-db || $(MKDIR) test-db ; \
+	test -d test-repl || $(MKDIR) test-repl ; \
 	$(SCRIPTSDIR)/all $(SCRIPTSDIR)
 
 install:	FORCE
diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index f6d7a7c51c508c0ea3475d1714ed65a027cf2929..bf9ed1786ddf7b96a85c46b867b09fcc6817eaaf 100755
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -7,7 +7,7 @@ LDAPADD=../clients/tools/ldapadd
 PORT=9009
 SLAVEPORT=9010
 MASTERLOG=./test-db/slapd.log
-REPLLOG=./test-repl/slapd.log
+SLAVELOG=./test-repl/slapd.log
 DBDIR=./test-db
 REPLDIR=./test-repl
 CONF=./data/slapd-master.conf