diff --git a/tests/kdc/krb5.conf.in b/tests/kdc/krb5.conf.in
index 3529ed9d6..3c09245de 100644
--- a/tests/kdc/krb5.conf.in
+++ b/tests/kdc/krb5.conf.in
@@ -1,7 +1,7 @@
 # $Id$
 
 [libdefaults]
-	default_realm = TEST.H5L.SE
+	default_realm = TEST.H5L.SE TEST2.H5L.SE
 	no-addresses = TRUE
 	allow_weak_crypto = @WEAK@
 
@@ -22,6 +22,7 @@
 	}
 	TEST2.H5L.SE = {
 		kdc = localhost:@port@
+		kpasswd_server = localhost:@pwport@
 	}
 	TEST3.H5L.SE = {
 		kdc = localhost:@port@
@@ -51,11 +52,20 @@
 	pkinit_allow_proxy_certificate = true
 
 	database = {
-		dbname = @objdir@/current-db@kdc@
-		realm = TEST.H5L.SE
-		mkey_file = @objdir@/mkey.file
-		acl_file = @srcdir@/heimdal.acl
-		log_file = @objdir@/current@kdc@.log
+		label = { 
+			dbname = @objdir@/current-db@kdc@
+			realm = TEST.H5L.SE
+			mkey_file = @objdir@/mkey.file
+			acl_file = @srcdir@/heimdal.acl
+			log_file = @objdir@/current@kdc@.log
+		}
+		label2 = { 
+			dbname = @objdir@/current-db@kdc@
+			realm = TEST2.H5L.SE
+			mkey_file = @objdir@/mkey.file
+			acl_file = @srcdir@/heimdal.acl
+			log_file = @objdir@/current@kdc@.log
+		}
 	}
 
 	signal_socket = @objdir@/signal