diff --git a/tests/kdc/krb5-canon.conf.in b/tests/kdc/krb5-canon.conf.in
index d01d355fa..0ce45b58c 100644
--- a/tests/kdc/krb5-canon.conf.in
+++ b/tests/kdc/krb5-canon.conf.in
@@ -41,6 +41,7 @@
 	enable-digest = true
 	allow-anonymous = true
 	digests_allowed = chap-md5,digest-md5,ntlm-v1,ntlm-v1-session,ntlm-v2,ms-chap-v2
+        strict-nametypes = true
 
 	enable-http = true
 
diff --git a/tests/kdc/krb5-canon2.conf.in b/tests/kdc/krb5-canon2.conf.in
index 444effd50..dae71d3e5 100644
--- a/tests/kdc/krb5-canon2.conf.in
+++ b/tests/kdc/krb5-canon2.conf.in
@@ -38,6 +38,7 @@
 	enable-digest = true
 	allow-anonymous = true
 	digests_allowed = chap-md5,digest-md5,ntlm-v1,ntlm-v1-session,ntlm-v2,ms-chap-v2
+        strict-nametypes = true
 
 	enable-http = true
 
diff --git a/tests/kdc/krb5-hdb-mitdb.conf.in b/tests/kdc/krb5-hdb-mitdb.conf.in
index 52996e93a..2be7eed4e 100644
--- a/tests/kdc/krb5-hdb-mitdb.conf.in
+++ b/tests/kdc/krb5-hdb-mitdb.conf.in
@@ -24,6 +24,7 @@
 	enable-digest = true
 	allow-anonymous = true
 	digests_allowed = chap-md5,digest-md5,ntlm-v1,ntlm-v1-session,ntlm-v2,ms-chap-v2
+        strict-nametypes = true
 
 	enable-http = true
 
diff --git a/tests/kdc/krb5-pkinit.conf.in b/tests/kdc/krb5-pkinit.conf.in
index a319fd42e..9be7ea400 100644
--- a/tests/kdc/krb5-pkinit.conf.in
+++ b/tests/kdc/krb5-pkinit.conf.in
@@ -13,6 +13,7 @@
 	}
 
 [kdc]
+        strict-nametypes = true
 	enable-pkinit = true
 	pkinit_identity = FILE:@objdir@/kdc.crt,@srcdir@/../../lib/hx509/data/key2.der
 	pkinit_anchors = FILE:@objdir@/ca.crt
diff --git a/tests/kdc/krb5.conf.in b/tests/kdc/krb5.conf.in
index 0e0240799..cc2dedb2d 100644
--- a/tests/kdc/krb5.conf.in
+++ b/tests/kdc/krb5.conf.in
@@ -75,6 +75,7 @@
 	enable-digest = true
 	allow-anonymous = true
 	digests_allowed = chap-md5,digest-md5,ntlm-v1,ntlm-v1-session,ntlm-v2,ms-chap-v2
+        strict-nametypes = true
 
 	enable-http = true
 
diff --git a/tests/kdc/krb5.conf.keys.in b/tests/kdc/krb5.conf.keys.in
index 2ba61f321..16891decb 100644
--- a/tests/kdc/krb5.conf.keys.in
+++ b/tests/kdc/krb5.conf.keys.in
@@ -2,6 +2,7 @@
 	allow_weak_crypto = TRUE
 
 [kdc]
+        strict-nametypes = true
 	database = {
 		dbname = @objdir@/current-db
 		realm = TEST.H5L.SE