diff --git a/tests/gss/check-context.in b/tests/gss/check-context.in
index 25d822f40..4abb7dd86 100644
--- a/tests/gss/check-context.in
+++ b/tests/gss/check-context.in
@@ -72,9 +72,9 @@ ${kadmin} \
     --realm-max-renewable-life=1month \
     ${R} || exit 1
 
-# add both lucid and lucid.example.org to simulate aliases
-${kadmin} add -p p1 --use-defaults host/lucid.example.org@${R} || exit 1
-${kadmin} ext -k ${keytab} host/lucid.example.org@${R} || exit 1
+# add both lucid and lucid.test.h5l.se to simulate aliases
+${kadmin} add -p p1 --use-defaults host/lucid.test.h5l.se@${R} || exit 1
+${kadmin} ext -k ${keytab} host/lucid.test.h5l.se@${R} || exit 1
 ${kadmin} add -p p1 --use-defaults host/lucid@${R} || exit 1
 ${kadmin} ext -k ${keytab} host/lucid@${R} || exit 1
 ${kadmin} add -p kaka --use-defaults digest/${R}@${R} || exit 1
@@ -104,19 +104,19 @@ ${kinit} --password-file=${objdir}/foopassword user1@${R} || exitcode=1
 
 echo test naming combinations
 echo plain
-${context} --name-type=hostbased-service host@lucid.example.org || \
+${context} --name-type=hostbased-service host@lucid.test.h5l.se || \
 	{ exitcode=1 ; echo test failed; }
 echo "plain (krb5)"
-${context} --name-type=krb5-principal-name host/lucid.example.org@${R} || \
+${context} --name-type=krb5-principal-name host/lucid.test.h5l.se@${R} || \
 	{ exitcode=1 ; echo test failed; }
 echo "plain (krb5 realmless)"
-${context} --name-type=krb5-principal-name host/lucid.example.org || \
+${context} --name-type=krb5-principal-name host/lucid.test.h5l.se || \
 	{ exitcode=1 ; echo test failed; }
 echo "dns canon on (long name)"
-${context} --dns-canon host@lucid.example.org || \
+${context} --dns-canon host@lucid.test.h5l.se || \
 	{ exitcode=1 ; echo test failed; }
 echo "dns canon off (long name)"
-${context} --no-dns-canon host@lucid.example.org || \
+${context} --no-dns-canon host@lucid.test.h5l.se || \
 	{ exitcode=1 ; echo test failed; }
 echo "dns canon off (short name)"
 ${context} --no-dns-canon host@lucid || \
@@ -130,18 +130,18 @@ ${context}  --no-dns-canon --name-type=krb5-principal-name host/lucid || \
 
 echo "test context building"
 echo "mutual"
-${context} --mutual --name-type=hostbased-service host@lucid.example.org || \
+${context} --mutual --name-type=hostbased-service host@lucid.test.h5l.se || \
 	{ exitcode=1 ; echo test failed; }
 
 #echo "dce-style"
-#${context} --dce-style --name-type=hostbased-service host@lucid.example.org || \
+#${context} --dce-style --name-type=hostbased-service host@lucid.test.h5l.se || \
 #	{ exitcode=1 ; echo test failed; }
 
 
 #echo "sasl-digest-md5"
 #${context}  --mech-type=sasl-digest-md5 \
 #    --name-type=hostbased-service \
-#    host@lucid.example.org || \
+#    host@lucid.test.h5l.se || \
 #	{ exitcode=1 ; echo test failed; }
 
 
diff --git a/tests/gss/check-gssmask.in b/tests/gss/check-gssmask.in
index 08fa129eb..fe0096ed8 100644
--- a/tests/gss/check-gssmask.in
+++ b/tests/gss/check-gssmask.in
@@ -50,9 +50,9 @@ keytabfile=${objdir}/server.keytab
 keytab="FILE:${keytabfile}"
 
 gssmask="${TESTS_ENVIRONMENT} ../../appl/gssmask/gssmask"
-gssmaskn1="${gssmask} -p 8889 --spn=host/n1.example.org@${R} --logfile=n1.log"
-gssmaskn2="${gssmask} -p 8890 --spn=host/n2.example.org@${R} --logfile=n2.log"
-gssmaskn3="${gssmask} -p 8891 --spn=host/n3.example.org@${R} --logfile=n3.log"
+gssmaskn1="${gssmask} -p 8889 --spn=host/n1.test.h5l.se@${R} --logfile=n1.log"
+gssmaskn2="${gssmask} -p 8890 --spn=host/n2.test.h5l.se@${R} --logfile=n2.log"
+gssmaskn3="${gssmask} -p 8891 --spn=host/n3.test.h5l.se@${R} --logfile=n3.log"
 gssmaestro="../../appl/gssmask/gssmaestro"
 
 KRB5_CONFIG="${objdir}/krb5.conf"
@@ -70,12 +70,12 @@ ${kadmin} \
     --realm-max-renewable-life=1month \
     ${R} || exit 1
 
-${kadmin} add -p p1 --use-defaults host/n1.example.org@${R} || exit 1
-${kadmin} add -p p2 --use-defaults host/n2.example.org@${R} || exit 1
-${kadmin} add -p p3 --use-defaults host/n3.example.org@${R} || exit 1
-${kadmin} ext -k ${keytab} host/n1.example.org@${R} || exit 1
-${kadmin} ext -k ${keytab} host/n2.example.org@${R} || exit 1
-${kadmin} ext -k ${keytab} host/n3.example.org@${R} || exit 1
+${kadmin} add -p p1 --use-defaults host/n1.test.h5l.se@${R} || exit 1
+${kadmin} add -p p2 --use-defaults host/n2.test.h5l.se@${R} || exit 1
+${kadmin} add -p p3 --use-defaults host/n3.test.h5l.se@${R} || exit 1
+${kadmin} ext -k ${keytab} host/n1.test.h5l.se@${R} || exit 1
+${kadmin} ext -k ${keytab} host/n2.test.h5l.se@${R} || exit 1
+${kadmin} ext -k ${keytab} host/n3.test.h5l.se@${R} || exit 1
 
 ${kadmin} add -p u1 --use-defaults user1@${R} || exit 1
 
diff --git a/tests/kdc/check-digest.in b/tests/kdc/check-digest.in
index f4424f504..3106a0e5b 100644
--- a/tests/kdc/check-digest.in
+++ b/tests/kdc/check-digest.in
@@ -47,7 +47,7 @@ port=8888
 kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
 kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
 
-server=host/datan.example.org
+server=host/datan.test.h5l.se
 cache="FILE:${objdir}/cache.krb5"
 ocache="FILE:${objdir}/ocache.krb5"
 keytabfile=${objdir}/server.keytab
diff --git a/tests/kdc/check-kdc.in b/tests/kdc/check-kdc.in
index f9916f462..fe2cdb64c 100644
--- a/tests/kdc/check-kdc.in
+++ b/tests/kdc/check-kdc.in
@@ -51,7 +51,7 @@ port=8888
 kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
 kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
 
-server=host/datan.example.org
+server=host/datan.test.h5l.se
 server2=host/computer.example.com
 cache="FILE:${objdir}/cache.krb5"
 ocache="FILE:${objdir}/ocache.krb5"