diff --git a/tests/kdc/check-digest.in b/tests/kdc/check-digest.in
index b1bd7e0aa..da5700ff8 100644
--- a/tests/kdc/check-digest.in
+++ b/tests/kdc/check-digest.in
@@ -50,8 +50,8 @@ R=TEST.H5L.SE
 
 port=@port@
 
-kadmin="${TESTS_ENVIRONMENT} ../../kadmin/kadmin -l -r $R"
-kdc="${TESTS_ENVIRONMENT} ../../kdc/kdc --addresses=localhost -P $port"
+kadmin="${kadmin} -l -r $R"
+kdc="${kdc} --addresses=localhost -P $port"
 
 server=host/datan.test.h5l.se
 cache="FILE:${objdir}/cache.krb5"
@@ -59,11 +59,9 @@ ocache="FILE:${objdir}/ocache.krb5"
 keytabfile=${objdir}/server.keytab
 keytab="FILE:${keytabfile}"
 
-kinit="${TESTS_ENVIRONMENT} ../../kuser/kinit -c $cache --no-afslog"
-klist="${TESTS_ENVIRONMENT} ../../kuser/klist -c $cache"
-kdigest="${TESTS_ENVIRONMENT} ../../kuser/kdigest --ccache=$cache"
-test_ntlm="${TESTS_ENVIRONMENT} ../../lib/gssapi/test_ntlm"
-context="${TESTS_ENVIRONMENT} ../../lib/gssapi/test_context"
+kinit="${kinit} -c $cache --no-afslog"
+klist="${klist} -c $cache"
+kdigest="${kdigest} --ccache=$cache"
 
 username=foo
 userpassword=digestpassword
@@ -135,19 +133,19 @@ NTLM_USER_FILE="${srcdir}/ntlm-user-file.txt"
 export NTLM_USER_FILE
 
 echo "test_context --mech-type=ntlm"
-${context} --mech-type=ntlm \
+${test_context} --mech-type=ntlm \
 	    --name-type=hostbased-service datan@TEST || \
 		{ echo "test_context 1 failed"; exit 1; }
 
-${context} --mech-type=ntlm \
+${test_context} --mech-type=ntlm \
 	    --name-type=hostbased-service datan@host.TEST || \
 		{ echo "test_context 2 failed"; exit 1; }
 
-${context} --mech-type=ntlm \
+${test_context} --mech-type=ntlm \
 	    --name-type=hostbased-service datan@host.test.domain2 || \
 		{ echo "test_context 3 failed"; exit 1; }
 
-${context} --mech-type=ntlm \
+${test_context} --mech-type=ntlm \
 	    --name-type=hostbased-service datan@host.foo 2>/dev/null && \
 		{ echo "test_context 4 failed"; exit 1; }
 
@@ -162,7 +160,7 @@ for type in \
     ; do
 
 	echo "Trying NTLM type: ${type}"
-	${context} --mech-type=ntlm ${type} \
+	${test_context} --mech-type=ntlm ${type} \
 	    --name-type=hostbased-service datan@TEST || \
 	    { echo "test_context 1 failed"; exit 1; }