diff --git a/tests/kdc/check-fast.in b/tests/kdc/check-fast.in
index 046ca120b..7f5354fc1 100644
--- a/tests/kdc/check-fast.in
+++ b/tests/kdc/check-fast.in
@@ -100,6 +100,10 @@ trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT
 
 ec=0
 
+#
+# Check armor ticket
+#
+
 echo "Getting client initial tickets"; > messages.log
 ${kinit} --password-file=${objdir}/foopassword foo@$R || \
 	{ ec=1 ; eval "${testfailed}"; }
@@ -111,29 +115,42 @@ echo "Listing tickets"; > messages.log
 ${klist} > /dev/null || { ec=1 ; eval "${testfailed}"; }
 ${kdestroy}
 
-echo "Acquire host ticket"
+echo "Acquire host ticket to be used as an ARMOR ticket"
 ${akinit} --password-file=${objdir}/foopassword ${server}@${R} >/dev/null|| { exit 1; }
-echo "Checking for FAST avail"
+echo "Checking for FAST avail (in the FAST armor cache)"
 ${aklist} --hidden | grep fast_avail > /dev/null || { exit 1; }
 
+#
+# Client tests
+#
+
 echo "Getting client initial tickets with FAST armor ticket"
 ${kinit} --fast-armor-cache=${acache} \
    --password-file=${objdir}/foopassword foo@$R || \
 	{ ec=1 ; eval "${testfailed}"; }
 
+echo "Checking for FAST avail (in the FAST acquired cache)"
+${klist} --hidden | grep fast_avail > /dev/null || { exit 1; }
 
+echo "Getting service ticket"
+${kgetcred} ${server}@${R} || { exit 1; }
+${kdestroy}
 
-kinitpty=${objdir}/foopassword.rkpty
-cat > ${kinitpty} <<EOF
-expect Password
-password foo\n
-EOF
+#
+# Use MIT client tools
+#
 
 mit=/usr/local/mitkerberos/bin
 
 if [ -f ${mit}/kinit ] ; then
    echo "Running MIT FAST tests"
 
+    kinitpty=${objdir}/foopassword.rkpty
+cat > ${kinitpty} <<EOF
+expect Password
+password foo\n
+EOF
+
    echo "Acquire host ticket"
    ${rkpty} ${kinitpty} ${mit}/kinit -c ${acache} ${server}@${R} >/dev/null|| { exit 1; }
    (${aklist} | grep ${server} > /dev/null ) || { exit 1; }