diff --git a/tests/Makefile.in b/tests/Makefile.in
index 21c1efa436..6d2767122c 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -34,6 +34,24 @@ test-passwd: FORCE
 	@-$(MKDIR) test-db test-repl || true
 	@$(srcdir)/scripts/passwd-search $(srcdir) passwd
 
+test-nis-schema:        test-nis-schema-ldbm
+test-nis-schema-ldbm:
+	@-$(LN_S) $(srcdir)/data .
+	@echo "Initiating LDAP server with NIS schema & ldbm backend..."; \
+	$(MKDIR) test-db test-repl ; \
+	$(srcdir)/scripts/startup_nis_ldap_server.sh $(srcdir) ldbm
+
+test-nis-schema-bdb2:
+	@-$(LN_S) $(srcdir)/data .
+	@echo "Initiating LDAP server with NIS schema & DB2 backend..."; \
+	@if test "$(BUILD_BDB2)" = "yes" ; then \
+		echo "Initiating LDAP tests..." ; \
+		$(MKDIR) test-db test-repl ; \
+		$(srcdir)/scripts/startup_nis_ldap_server.sh $(srcdir) bdb2 ; \
+	else \
+		echo "run configure with --enable-bdb2" ; \
+	fi
+
 clean-local:	FORCE
 	-$(RM) test-db/[!C]* test-repl/[!C]* *core