diff --git a/tests/gss/check-ntlm.in b/tests/gss/check-ntlm.in
index de247cd18..a929e6657 100644
--- a/tests/gss/check-ntlm.in
+++ b/tests/gss/check-ntlm.in
@@ -134,7 +134,6 @@ KRB5CCNAME="$cache"
 
 echo "no NTLM initiator creds"
 ${context} --mech-type=ntlm \
-	--client-name=user1@${R} \
 	--mutual \
         --name-type=hostbased-service \
         --ret-mech-type=ntlm \
@@ -146,7 +145,6 @@ ${kinit} --password-file=${objdir}/foopassword --ntlm-domain=TEST user1@${R} ||
 
 echo "NTLM initiator krb5 creds"
 ${context} --mech-type=ntlm \
-	--client-name=user1@${R} \
 	--mutual \
         --name-type=hostbased-service \
         --ret-mech-type=ntlm \
@@ -155,7 +153,6 @@ ${context} --mech-type=ntlm \
 
 echo "NTLM initiator krb5 creds (getverifymic, wrapunwrap)"
 ${context} --mech-type=ntlm \
-	--client-name=user1@${R} \
 	--mutual \
         --name-type=hostbased-service \
         --ret-mech-type=ntlm \
diff --git a/tests/gss/check-spnego.in b/tests/gss/check-spnego.in
index cf28d334c..7e90f5bba 100644
--- a/tests/gss/check-spnego.in
+++ b/tests/gss/check-spnego.in
@@ -124,8 +124,7 @@ echo "======context building for each mech"
 
 for mech in ntlm krb5 ; do 
     echo "${mech}"
-    ${context} --mech-type=${mech} --client-name=user1@${R} \
-        --ret-mech-type=${mech} \
+    ${context} --mech-type=${mech} --ret-mech-type=${mech} \
         --name-type=hostbased-service host@host.test.h5l.se || \
 	{ exitcode=1 ; echo test failed; }
 done
@@ -133,18 +132,17 @@ done
 echo "spnego"
 ${context} \
     --mech-type=spnego \
-    --client-name=user1@${R} \
     --ret-mech-type=krb5 \
     --name-type=hostbased-service \
     host@host.test.h5l.se || \
     { exitcode=1 ; echo test failed; }
 
 echo "test failure cases"
-${context} --mech-type=ntlm --client-name=user1@${R} --ret-mech-type=krb5 \
+${context} --mech-type=ntlm --ret-mech-type=krb5 \
     --name-type=hostbased-service host@host.test.h5l.se 2> /dev/null && \
     { exitcode=1 ; echo test failed; }
 
-${context} --mech-type=krb5 --client-name=user1@${R} --ret-mech-type=ntlm \
+${context} --mech-type=krb5 --ret-mech-type=ntlm \
     --name-type=hostbased-service host@host.test.h5l.se 2> /dev/null && \
     { exitcode=1 ; echo test failed; }
 
@@ -161,9 +159,8 @@ for arg in \
 
     echo "no NTLM acceptor cred ${arg}"
     NTLM_ACCEPTOR_CCACHE="${cacheds}-no"
-    ${context} --mech-type=spnego --client-name=user1@${R} \
+    ${context} --mech-type=spnego \
         $arg \
-	--client-name=user1@TEST.H5L.SE \
         --name-type=hostbased-service \
         --ret-mech-type=krb5  \
         host@host.test.h5l.se || \
@@ -172,9 +169,8 @@ for arg in \
 
     echo "no NTLM initiator cred ${arg}"
     NTLM_USER_FILE="${srcdir}/ntlm-user-file.txt-no"
-    ${context} --mech-type=spnego --client-name=user1@${R} \
+    ${context} --mech-type=spnego \
         $arg \
-	--client-name=user1@TEST.H5L.SE \
         --name-type=hostbased-service \
         --ret-mech-type=krb5 \
         host@host.test.h5l.se || \
@@ -183,9 +179,8 @@ for arg in \
 
     echo "no krb5 acceptor cred ${arg}"
     KRB5_KTNAME="${keytab}-no"
-    ${context} --mech-type=spnego --client-name=user1@${R} \
+    ${context} --mech-type=spnego \
         $arg \
-	--client-name=user1@TEST.H5L.SE \
 	--server-no-delegate \
         --name-type=hostbased-service \
         --ret-mech-type=ntlm \
@@ -195,9 +190,8 @@ for arg in \
 
     echo "no krb5 initiator cred ${arg}"
     KRB5CCNAME="${cache}-no"
-    ${context} --mech-type=spnego --client-name=user1@${R} \
+    ${context} --mech-type=spnego \
         $arg \
-	--client-name=user1@TEST.H5L.SE \
 	--server-no-delegate \
         --name-type=hostbased-service \
         --ret-mech-type=ntlm \