diff --git a/tests/xbps/Makefile b/tests/xbps/Makefile
index 50096e4a..14d5e96f 100644
--- a/tests/xbps/Makefile
+++ b/tests/xbps/Makefile
@@ -1,5 +1,5 @@
 -include ../../config.mk
 
-SUBDIRS = common libxbps xbps-install xbps-query xbps-rindex
+SUBDIRS = common libxbps xbps-install xbps-query xbps-rindex xbps-checkvers
 
 include ../../mk/subdir.mk
diff --git a/tests/xbps/common/Kyuafile b/tests/xbps/common/Kyuafile
index 6a9ca533..c98aa3f6 100644
--- a/tests/xbps/common/Kyuafile
+++ b/tests/xbps/common/Kyuafile
@@ -6,3 +6,4 @@ include('libxbps/Kyuafile')
 include('xbps-install/Kyuafile')
 include('xbps-query/Kyuafile')
 include('xbps-rindex/Kyuafile')
+include('xbps-checkvers/Kyuafile')
diff --git a/tests/xbps/xbps-checkvers/Kyuafile b/tests/xbps/xbps-checkvers/Kyuafile
index 0dd9e6dc..6449ad3f 100644
--- a/tests/xbps/xbps-checkvers/Kyuafile
+++ b/tests/xbps/xbps-checkvers/Kyuafile
@@ -1,4 +1,4 @@
 syntax("kyuafile", 1)
 
-test_suite("xbps-install")
-atf_test_program{name="checkvers.sh"}
+test_suite("xbps-checkvers")
+atf_test_program{name="checkvers"}
diff --git a/tests/xbps/xbps-checkvers/Makefile b/tests/xbps/xbps-checkvers/Makefile
index e673f7d8..ffcbdf5e 100644
--- a/tests/xbps/xbps-checkvers/Makefile
+++ b/tests/xbps/xbps-checkvers/Makefile
@@ -2,7 +2,7 @@ TOPDIR = ../../..
 -include $(TOPDIR)/config.mk
 
 TESTSHELL = checkvers
-TESTSSUBDIR = xbps/xbps-install
+TESTSSUBDIR = xbps/xbps-checkvers
 EXTRA_FILES = Kyuafile
 
 include $(TOPDIR)/mk/test.mk