diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 4b4b4bb96a6..d4f7d44b27b 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -36,6 +36,8 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20220607: libkqueue test updates
+OLD_FILES+=usr/tests/sys/kqueue/libkqueue/kqtest
 # 20220604: new clang import which bumps version from 13.0.0 to 14.0.3
 OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/algorithm
 OLD_FILES+=usr/lib/clang/13.0.0/include/cuda_wrappers/complex
diff --git a/tests/sys/kqueue/libkqueue/Makefile b/tests/sys/kqueue/libkqueue/Makefile
index cc29e35aa51..869b71209c4 100644
--- a/tests/sys/kqueue/libkqueue/Makefile
+++ b/tests/sys/kqueue/libkqueue/Makefile
@@ -4,11 +4,9 @@ TESTSDIR=	${TESTSBASE}/sys/kqueue/libkqueue
 BINDIR=		${TESTSDIR}
 
 # libkqueue and test suite by Mark Heily <mark@heily.com>
-TAP_TESTS_SH=	kqueue_test
+PLAIN_TESTS_C=	kqueue_test
 
-PROGS=	kqtest
-
-SRCS.kqtest=		\
+SRCS.kqueue_test=	\
 	main.c		\
 	read.c		\
 	timer.c		\
diff --git a/tests/sys/kqueue/libkqueue/kqueue_test.sh b/tests/sys/kqueue/libkqueue/kqueue_test.sh
deleted file mode 100644
index 3185d826c7d..00000000000
--- a/tests/sys/kqueue/libkqueue/kqueue_test.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-i=1
-"$(dirname $0)/kqtest" | while read line; do
-	echo $line | grep -q passed
-	if [ $? -eq 0 ]; then
-		echo "ok - $i $line"
-		: $(( i += 1 ))
-	fi
-
-	echo $line | grep -q 'tests completed'
-	if [ $? -eq 0 ]; then
-		echo -n "1.."
-		echo $line | cut -d' ' -f3
-	fi
-done