diff --git a/CHANGES b/CHANGES
index 9b0847456b..538bcfe41d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4851.	[port]		Support using kyua as well as atf-run to run the unit
+			tests. [RT #46853]
+
 4850.	[bug]		Named failed to restart with multiple added zones in
 			lmdb database. [RT #46889]
 
diff --git a/unit/unittest.sh.in b/unit/unittest.sh.in
index 899e00ebf8..de304c641d 100644
--- a/unit/unittest.sh.in
+++ b/unit/unittest.sh.in
@@ -2,17 +2,19 @@
 
 PATH="@ATFBIN@:${PATH}"
 export PATH
+ATFRUN=`type atf-run 2>/dev/null | awk '{print $3}'`
+KYUA=`type kyua 2>/dev/null | awk '{print $3}'`
 
 status=0
-if [ -n "@ATFBIN@" -a -f Atffile ]
+if [ -n "@UNITTESTS@" -a -x "$ATFRUN" -a -f Atffile ]
 then
 	echo "S:unit:`date`"
-        echo "T:unit:1:A"
+	echo "T:unit:1:A"
 	echo "I: unit tests"
 	atf-run > atf.out
 	status=$?
 
-        # | cat is there to force non-fancy output
+	# | cat is there to force non-fancy output
 	atf-report < atf.out | cat
 
 	if [ $status -eq 0 ]
@@ -23,5 +25,23 @@ then
 		echo R:FAIL
 	fi
 	echo "E:unit:`date`"
+elif [ -n "@UNITTESTS@" -a -x "$KYUA" -a -f Kyuafile ]
+then
+	echo "S:unit:`date`"
+	echo "T:unit:1:A"
+	echo "I: unit tests"
+	kyua --logfile kyua.log test
+	status=$?
+
+	kyua report
+
+	if [ $status -eq 0 ]
+	then
+		rm -f kyua.log
+		echo R:PASS
+	else
+		echo R:FAIL
+	fi
+	echo "E:unit:`date`"
 fi
 exit $status