diff --git a/tests/kdc/check-iprop.in b/tests/kdc/check-iprop.in
index 448824653..962bd815e 100644
--- a/tests/kdc/check-iprop.in
+++ b/tests/kdc/check-iprop.in
@@ -83,8 +83,8 @@ ${kadmin} -l add -p foo --use-defaults user@${R} || exit 1
 
 ${kadmin} -l add --random-key --use-defaults iprop/localhost@${R} || exit 1
 ${kadmin} -l ext -k ${keytab} iprop/localhost@${R} || exit 1
-${kadmin} -l add --random-key --use-defaults iprop/slave@${R} || exit 1
-${kadmin} -l ext -k ${keytab} iprop/slave@${R} || exit 1
+${kadmin} -l add --random-key --use-defaults iprop/slave.test.h5l.se@${R} || exit 1
+${kadmin} -l ext -k ${keytab} iprop/slave.test.h5l.se@${R} || exit 1
 
 echo foo > ${objdir}/foopassword
 
@@ -110,12 +110,12 @@ sh ${srcdir}/wait-kdc.sh ipropd-master || exit 1
 
 echo "starting slave"
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropdslave} --hostname=slave -k ${keytab} localhost &
+${ipropdslave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
 ipds=$!
 sh ${srcdir}/wait-kdc.sh ipropd-slave || exit 1
 
 echo "checking slave is up"
-${EGREP} 'iprop/slave@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
+${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
 
 # ----------------- checking: pushing lives changes
 
@@ -144,7 +144,7 @@ echo "kill slave"
 kill ${ipds}
 sleep 2
 
-${EGREP} 'iprop/slave@TEST.H5L.SE.*Down' iprop-stats >/dev/null || exit 1
+${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Down' iprop-stats >/dev/null || exit 1
 
 # ----------------- checking: slave is missing changes while down
 
@@ -161,12 +161,12 @@ echo "starting slave again"
 > iprop-stats
 > messages.log
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropdslave} --hostname=slave -k ${keytab} localhost &
+${ipropdslave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
 ipds=$!
 sh ${srcdir}/wait-kdc.sh ipropd-slave || exit 1
 
 echo "checking slave is up again"
-${EGREP} 'iprop/slave@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
+${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
 echo "checking for replay problems"
 ${EGREP} 'Entry already exists in database' messages.log && exit 1
 
@@ -178,12 +178,12 @@ rm current.slave.log current-db.slave* || exit 1
 > iprop-stats
 > messages.log
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropdslave} --hostname=slave -k ${keytab} localhost &
+${ipropdslave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
 ipds=$!
 sh ${srcdir}/wait-kdc.sh ipropd-slave || exit 1
 
 echo "checking slave is up again"
-${EGREP} 'iprop/slave@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
+${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
 echo "checking for replay problems"
 ${EGREP} 'Entry already exists in database' messages.log && exit 1
 
@@ -223,12 +223,12 @@ sh ${srcdir}/wait-kdc.sh ipropd-master || exit 1
 
 echo "starting slave"
 KRB5_CONFIG="${objdir}/krb5-slave.conf" \
-${ipropdslave} --hostname=slave -k ${keytab} localhost &
+${ipropdslave} --hostname=slave.test.h5l.se -k ${keytab} localhost &
 ipds=$!
 sh ${srcdir}/wait-kdc.sh ipropd-slave || exit 1
 
 echo "checking slave is up again"
-${EGREP} 'iprop/slave@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
+${EGREP} 'iprop/slave.test.h5l.se@TEST.H5L.SE.*Up' iprop-stats >/dev/null || exit 1
 echo "checking for replay problems"
 ${EGREP} 'Entry already exists in database' messages.log && exit 1
 
diff --git a/tests/kdc/iprop-acl b/tests/kdc/iprop-acl
index d43f882d1..334a407fe 100644
--- a/tests/kdc/iprop-acl
+++ b/tests/kdc/iprop-acl
@@ -1 +1 @@
-iprop/slave@TEST.H5L.SE
+iprop/slave.test.h5l.se@TEST.H5L.SE
diff --git a/tests/kdc/krb5.conf.in b/tests/kdc/krb5.conf.in
index 1612234a4..50f2e32c7 100644
--- a/tests/kdc/krb5.conf.in
+++ b/tests/kdc/krb5.conf.in
@@ -21,6 +21,7 @@
 	}
 
 [domain_realm]
+	.test.h5l.se = TEST.H5L.SE
 	.sub.test.h5l.se = SUB.TEST.H5L.SE
 	.example.com = TEST2.H5L.SE
 	localhost = TEST.H5L.SE