diff --git a/share/mk/suite.test.mk b/share/mk/suite.test.mk
index 69cd02d684de..e772ccd1b292 100644
--- a/share/mk/suite.test.mk
+++ b/share/mk/suite.test.mk
@@ -1,126 +1,126 @@
 # $FreeBSD$
 #
 # You must include bsd.test.mk instead of this file from your Makefile.
 #
 # Internal glue for the build of /usr/tests/.
 
 .if !target(__<bsd.test.mk>__)
 .error suite.test.mk cannot be included directly.
 .endif
 
 .include <bsd.opts.mk>
 
 # Name of the test suite these tests belong to.  Should rarely be changed for
 # Makefiles built into the FreeBSD src tree.
 TESTSUITE?= FreeBSD
 
 # Knob to control the handling of the Kyuafile for this Makefile.
 #
 # If 'yes', a Kyuafile exists in the source tree and is installed into
 # TESTSDIR.
 #
 # If 'auto', a Kyuafile is automatically generated based on the list of test
 # programs built by the Makefile and is installed into TESTSDIR.  This is the
 # default and is sufficient in the majority of the cases.
 #
 # If 'no', no Kyuafile is installed.
 KYUAFILE?= auto
 
 # Per-test program interface definition.
 #
 # The name provided here must match one of the interface names supported by
 # Kyua as this is later encoded in the Kyuafile test program definitions.
 #TEST_INTERFACE.<test-program>= interface-name
 
 # Metadata properties applicable to all test programs.
 #
 # All the variables for a test program defined in the Makefile are appended
 # to the test program's definition in the Kyuafile.  This feature can be
 # used to avoid having to explicitly supply a Kyuafile in the source
 # directory, allowing the caller Makefile to rely on the KYUAFILE=auto
 # behavior defined here.
 #TEST_METADATA+= key="value"
 
 # Per-test program metadata properties as a list of key/value pairs.
 #
 # These per-test program settings _extend_ the values provided in the
 # unqualified TEST_METADATA variable.
 #TEST_METADATA.<test-program>+= key="value"
 
 .if ${KYUAFILE:tl} != "no"
 ${PACKAGE}FILES+=	Kyuafile
 ${PACKAGE}FILESDIR_Kyuafile=	${TESTSDIR}
 .endif
 
 .for _T in ${_TESTS}
 _TEST_METADATA.${_T}= ${TEST_METADATA} ${TEST_METADATA.${_T}}
 .endfor
 
 .if ${KYUAFILE:tl} == "auto"
 CLEANFILES+= Kyuafile Kyuafile.tmp
 Kyuafile: Makefile
 	@{ \
 	    echo '-- Automatically generated by bsd.test.mk.'; \
 	    echo; \
 	    echo 'syntax(2)'; \
 	    echo; \
 	    echo 'test_suite("${TESTSUITE}")'; \
             echo; \
 	} > ${.TARGET}.tmp
 .for _T in ${_TESTS}
 	@echo '${TEST_INTERFACE.${_T}}_test_program{name="${_T}"${_TEST_METADATA.${_T}:C/$/,/:tW:C/^/, /W:C/,$//W}}' \
 	    >>${.TARGET}.tmp
 .endfor
 .for _T in ${TESTS_SUBDIRS:N.WAIT}
 	@echo "include(\"${_T}/${.TARGET}\")" >>${.TARGET}.tmp
 .endfor
 	@mv ${.TARGET}.tmp ${.TARGET}
 .endif
 
-KYUA= ${LOCALBASE}/bin/kyua
+KYUA?=	kyua
 
 # Definition of the "make check" target and supporting variables.
 #
 # This target, by necessity, can only work for native builds (i.e. a FreeBSD
 # host building a release for the same system).  The target runs Kyua, which is
 # not in the toolchain, and the tests execute code built for the target host.
 #
 # Due to the dependencies of the binaries built by the source tree and how they
 # are used by tests, it is highly possible for a execution of "make test" to
 # report bogus results unless the new binaries are put in place.
 
 realcheck: .PHONY
-	@if [ ! -x ${KYUA} ]; then \
+	if ! which -s "${KYUA}"; then \
 		echo; \
 		echo "kyua binary not installed at expected location (${.TARGET})"; \
 		echo; \
 		echo "Please install via pkg install, or specify the path to the kyua"; \
-		echo "package via the \$${LOCALBASE} variable, e.g. "; \
-		echo "LOCALBASE=\"${LOCALBASE}\""; \
+		echo "binary via the \$${KYUA} variable, e.g., "; \
+		echo "KYUA=\"${LOCALBASE}/bin/kyua\""; \
 		false; \
 	fi
 	@env ${TESTS_ENV:Q} ${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile
 
 MAKE_CHECK_SANDBOX_DIR=	checkdir
 CLEANDIRS+=	${MAKE_CHECK_SANDBOX_DIR}
 
 .if ${MK_MAKE_CHECK_USE_SANDBOX} != "no" && make(check)
 DESTDIR:=	${.OBJDIR}/${MAKE_CHECK_SANDBOX_DIR}
 
 beforecheck:
 .for t in clean depend all
 	@cd ${.CURDIR} && ${MAKE} $t
 .endfor
 	@cd ${SRCTOP} && ${MAKE} hierarchy DESTDIR=${DESTDIR}
 	@cd ${.CURDIR} && ${MAKE} install \
 	    DESTDIR=${DESTDIR}
 
 # NOTE: this is intentional to ensure that "make check" can be run multiple
 #       times. "aftercheck" won't be run if "make check" fails, is interrupted,
 #       etc.
 aftercheck:
 	@cd ${.CURDIR} && ${MAKE} clean
 	@test ! -e ${DESTDIR} || chflags -R 0 "${DESTDIR}"
 	@rm -Rf "${DESTDIR}"
 
 .endif