diff --git a/tests/xbps/common/Kyuafile b/tests/xbps/Kyuafile
similarity index 100%
rename from tests/xbps/common/Kyuafile
rename to tests/xbps/Kyuafile
diff --git a/tests/xbps/common/Makefile b/tests/xbps/common/Makefile
index 7102b113..fb1a3258 100644
--- a/tests/xbps/common/Makefile
+++ b/tests/xbps/common/Makefile
@@ -7,7 +7,7 @@ all:
 
 install:
 	install -d $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
-	install -m644 Kyuafile $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
+	install -m644 ../Kyuafile $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
 
 uninstall:
 	-rm -f $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)/Kyuafile
diff --git a/tests/xbps/libxbps/Kyuafile b/tests/xbps/libxbps/Kyuafile
new file mode 100644
index 00000000..d052bf43
--- /dev/null
+++ b/tests/xbps/libxbps/Kyuafile
@@ -0,0 +1,14 @@
+syntax("kyuafile", 1)
+
+test_suite("libxbps")
+
+include('util/Kyuafile')
+include('cmpver/Kyuafile')
+include('pkgpattern_match/Kyuafile')
+include('plist_match/Kyuafile')
+include('plist_match_virtual/Kyuafile')
+include('find_pkg_obsoletes/Kyuafile')
+include('config/Kyuafile')
+include('find_pkg_orphans/Kyuafile')
+include('pkgdb/Kyuafile')
+include('shell/Kyuafile')
diff --git a/tests/xbps/libxbps/cmpver/Kyuafile b/tests/xbps/libxbps/cmpver/Kyuafile
new file mode 100644
index 00000000..9d88f6a8
--- /dev/null
+++ b/tests/xbps/libxbps/cmpver/Kyuafile
@@ -0,0 +1,5 @@
+syntax("kyuafile", 1)
+
+test_suite("libxbps")
+
+atf_test_program{name="cmpver_test"}
diff --git a/tests/xbps/libxbps/cmpver/Makefile b/tests/xbps/libxbps/cmpver/Makefile
index c0af71af..18696b38 100644
--- a/tests/xbps/libxbps/cmpver/Makefile
+++ b/tests/xbps/libxbps/cmpver/Makefile
@@ -1,7 +1,8 @@
 TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
+TESTSSUBDIR = xbps/libxbps/cmpver
 TEST = cmpver_test
+EXTRA_FILES = Kyuafile
 
-include ../Makefile.inc
 include $(TOPDIR)/mk/test.mk
diff --git a/tests/xbps/libxbps/common/Makefile b/tests/xbps/libxbps/common/Makefile
index bffa6f94..33a6b636 100644
--- a/tests/xbps/libxbps/common/Makefile
+++ b/tests/xbps/libxbps/common/Makefile
@@ -7,7 +7,7 @@ all:
 
 install:
 	install -d $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
-	install -m644 Kyuafile $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
+	install -m644 ../Kyuafile $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
 
 uninstall:
 	-rm -f $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)/Kyuafile
diff --git a/tests/xbps/libxbps/find_pkg_obsoletes/Kyuafile b/tests/xbps/libxbps/find_pkg_obsoletes/Kyuafile
new file mode 100644
index 00000000..8d158b5f
--- /dev/null
+++ b/tests/xbps/libxbps/find_pkg_obsoletes/Kyuafile
@@ -0,0 +1,5 @@
+syntax("kyuafile", 1)
+
+test_suite("libxbps")
+
+atf_test_program{name="find_pkg_obsoletes_test"}
diff --git a/tests/xbps/libxbps/find_pkg_obsoletes/Makefile b/tests/xbps/libxbps/find_pkg_obsoletes/Makefile
index 739f9ad1..e0c07e37 100644
--- a/tests/xbps/libxbps/find_pkg_obsoletes/Makefile
+++ b/tests/xbps/libxbps/find_pkg_obsoletes/Makefile
@@ -1,7 +1,8 @@
 TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
+TESTSSUBDIR = xbps/libxbps/find_pkg_obsoletes
 TEST = find_pkg_obsoletes_test
+EXTRA_FILES = Kyuafile
 
-include ../Makefile.inc
 include $(TOPDIR)/mk/test.mk
diff --git a/tests/xbps/libxbps/pkgpattern_match/Kyuafile b/tests/xbps/libxbps/pkgpattern_match/Kyuafile
new file mode 100644
index 00000000..f34c42a5
--- /dev/null
+++ b/tests/xbps/libxbps/pkgpattern_match/Kyuafile
@@ -0,0 +1,5 @@
+syntax("kyuafile", 1)
+
+test_suite("libxbps")
+
+atf_test_program{name="pkgpattern_match_test"}
diff --git a/tests/xbps/libxbps/pkgpattern_match/Makefile b/tests/xbps/libxbps/pkgpattern_match/Makefile
index 52ada419..f13caa4a 100644
--- a/tests/xbps/libxbps/pkgpattern_match/Makefile
+++ b/tests/xbps/libxbps/pkgpattern_match/Makefile
@@ -1,7 +1,8 @@
 TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
+TESTSSUBDIR = xbps/libxbps/pkgpattern_match
 TEST = pkgpattern_match_test
+EXTRA_FILES = Kyuafile
 
-include ../Makefile.inc
 include $(TOPDIR)/mk/test.mk
diff --git a/tests/xbps/libxbps/plist_match/Kyuafile b/tests/xbps/libxbps/plist_match/Kyuafile
new file mode 100644
index 00000000..2a505f67
--- /dev/null
+++ b/tests/xbps/libxbps/plist_match/Kyuafile
@@ -0,0 +1,5 @@
+syntax("kyuafile", 1)
+
+test_suite("libxbps")
+
+atf_test_program{name="plist_match_test"}
diff --git a/tests/xbps/libxbps/plist_match/Makefile b/tests/xbps/libxbps/plist_match/Makefile
index 685b94d9..0bfaf99f 100644
--- a/tests/xbps/libxbps/plist_match/Makefile
+++ b/tests/xbps/libxbps/plist_match/Makefile
@@ -1,7 +1,8 @@
 TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
+TESTSSUBDIR = xbps/libxbps/plist_match
 TEST = plist_match_test
+EXTRA_FILES = Kyuafile
 
-include ../Makefile.inc
 include $(TOPDIR)/mk/test.mk
diff --git a/tests/xbps/libxbps/plist_match_virtual/Kyuafile b/tests/xbps/libxbps/plist_match_virtual/Kyuafile
new file mode 100644
index 00000000..3f6d14d1
--- /dev/null
+++ b/tests/xbps/libxbps/plist_match_virtual/Kyuafile
@@ -0,0 +1,5 @@
+syntax("kyuafile", 1)
+
+test_suite("libxbps")
+
+atf_test_program{name="plist_match_virtual_test"}
diff --git a/tests/xbps/libxbps/plist_match_virtual/Makefile b/tests/xbps/libxbps/plist_match_virtual/Makefile
index ba360169..9865d97b 100644
--- a/tests/xbps/libxbps/plist_match_virtual/Makefile
+++ b/tests/xbps/libxbps/plist_match_virtual/Makefile
@@ -1,7 +1,8 @@
 TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
+TESTSSUBDIR = xbps/libxbps/plist_match_virtual
 TEST = plist_match_virtual_test
+EXTRA_FILES = Kyuafile
 
-include ../Makefile.inc
 include $(TOPDIR)/mk/test.mk
diff --git a/tests/xbps/libxbps/common/Kyuafile b/tests/xbps/libxbps/shell/Kyuafile
similarity index 64%
rename from tests/xbps/libxbps/common/Kyuafile
rename to tests/xbps/libxbps/shell/Kyuafile
index e605007a..5bc1f1de 100644
--- a/tests/xbps/libxbps/common/Kyuafile
+++ b/tests/xbps/libxbps/shell/Kyuafile
@@ -2,12 +2,6 @@ syntax("kyuafile", 1)
 
 test_suite("libxbps")
 
-atf_test_program{name="util_test"}
-atf_test_program{name="cmpver_test"}
-atf_test_program{name="pkgpattern_match_test"}
-atf_test_program{name="plist_match_test"}
-atf_test_program{name="plist_match_virtual_test"}
-atf_test_program{name="find_pkg_obsoletes_test"}
 atf_test_program{name="issue6_test"}
 atf_test_program{name="issue18_test"}
 atf_test_program{name="issue20_test"}
@@ -23,7 +17,3 @@ atf_test_program{name="vpkg_test"}
 atf_test_program{name="install_test"}
 atf_test_program{name="preserve_files_test"}
 atf_test_program{name="update_shlibs"}
-
-include('config/Kyuafile')
-include('find_pkg_orphans/Kyuafile')
-include('pkgdb/Kyuafile')
diff --git a/tests/xbps/libxbps/shell/Makefile b/tests/xbps/libxbps/shell/Makefile
index 37eef8f4..060a4502 100644
--- a/tests/xbps/libxbps/shell/Makefile
+++ b/tests/xbps/libxbps/shell/Makefile
@@ -1,11 +1,12 @@
 TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
+TESTSSUBDIR = xbps/libxbps/shell
 TESTSHELL = conf_files_test issue6_test issue18_test issue20_test remove_test
 TESTSHELL+= replace_test installmode_test obsoletefiles_test
 TESTSHELL+= issue31_test scripts_test incorrect_deps_test
 TESTSHELL+= vpkg_test install_test preserve_files_test
 TESTSHELL+= update_shlibs
+EXTRA_FILES = Kyuafile
 
-include ../Makefile.inc
 include $(TOPDIR)/mk/test.mk
diff --git a/tests/xbps/libxbps/util/Kyuafile b/tests/xbps/libxbps/util/Kyuafile
new file mode 100644
index 00000000..bea04510
--- /dev/null
+++ b/tests/xbps/libxbps/util/Kyuafile
@@ -0,0 +1,5 @@
+syntax("kyuafile", 1)
+
+test_suite("libxbps")
+
+atf_test_program{name="util_test"}
diff --git a/tests/xbps/libxbps/util/Makefile b/tests/xbps/libxbps/util/Makefile
index 410f3be4..5043e5fe 100644
--- a/tests/xbps/libxbps/util/Makefile
+++ b/tests/xbps/libxbps/util/Makefile
@@ -1,7 +1,8 @@
 TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
+TESTSSUBDIR = xbps/libxbps/util
 TEST = util_test
+EXTRA_FILES = Kyuafile
 
-include ../Makefile.inc
 include $(TOPDIR)/mk/test.mk