diff --git a/tests/Makefile b/tests/Makefile
index 547b73f4..72a50679 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,5 +1,5 @@
 -include ../config.mk
 
-SUBDIRS = libxbps xbps-rindex
+SUBDIRS = xbps
 
 include ../mk/subdir.mk
diff --git a/tests/libxbps/Makefile.inc b/tests/libxbps/Makefile.inc
deleted file mode 100644
index f49f88cf..00000000
--- a/tests/libxbps/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-TESTSSUBDIR = libxbps
diff --git a/tests/xbps-rindex/Makefile.inc b/tests/xbps-rindex/Makefile.inc
deleted file mode 100644
index 5767c145..00000000
--- a/tests/xbps-rindex/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-TESTSSUBDIR = xbps-rindex
diff --git a/tests/xbps-rindex/Makefile b/tests/xbps/Makefile
similarity index 59%
rename from tests/xbps-rindex/Makefile
rename to tests/xbps/Makefile
index 9d4629b3..7446b80a 100644
--- a/tests/xbps-rindex/Makefile
+++ b/tests/xbps/Makefile
@@ -1,5 +1,5 @@
 -include ../../config.mk
 
-SUBDIRS = common issue19
+SUBDIRS = common libxbps xbps-rindex
 
 include ../../mk/subdir.mk
diff --git a/tests/xbps/common/Kyuafile b/tests/xbps/common/Kyuafile
new file mode 100644
index 00000000..f23f4332
--- /dev/null
+++ b/tests/xbps/common/Kyuafile
@@ -0,0 +1,6 @@
+syntax("kyuafile", 1)
+
+test_suite("xbps")
+
+include('libxbps/Kyuafile')
+include('xbps-rindex/Kyuafile')
diff --git a/tests/xbps/common/Makefile b/tests/xbps/common/Makefile
new file mode 100644
index 00000000..7102b113
--- /dev/null
+++ b/tests/xbps/common/Makefile
@@ -0,0 +1,15 @@
+TOPDIR = ../../..
+-include $(TOPDIR)/config.mk
+
+TESTSSUBDIR = xbps
+
+all:
+
+install:
+	install -d $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
+	install -m644 Kyuafile $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
+
+uninstall:
+	-rm -f $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)/Kyuafile
+
+clean:
diff --git a/tests/libxbps/Makefile b/tests/xbps/libxbps/Makefile
similarity index 79%
rename from tests/libxbps/Makefile
rename to tests/xbps/libxbps/Makefile
index 7d0f60e0..8d032749 100644
--- a/tests/libxbps/Makefile
+++ b/tests/xbps/libxbps/Makefile
@@ -1,4 +1,4 @@
--include ../../config.mk
+-include ../../../config.mk
 
 SUBDIRS = common
 
@@ -12,4 +12,4 @@ SUBDIRS += find_pkg_orphans
 SUBDIRS += pkgdb
 SUBDIRS += issue18
 
-include ../../mk/subdir.mk
+include ../../../mk/subdir.mk
diff --git a/tests/xbps/libxbps/Makefile.inc b/tests/xbps/libxbps/Makefile.inc
new file mode 100644
index 00000000..0a9ab8f6
--- /dev/null
+++ b/tests/xbps/libxbps/Makefile.inc
@@ -0,0 +1 @@
+TESTSSUBDIR = xbps/libxbps
diff --git a/tests/libxbps/cmpver/Makefile b/tests/xbps/libxbps/cmpver/Makefile
similarity index 83%
rename from tests/libxbps/cmpver/Makefile
rename to tests/xbps/libxbps/cmpver/Makefile
index 4537ffe4..c0af71af 100644
--- a/tests/libxbps/cmpver/Makefile
+++ b/tests/xbps/libxbps/cmpver/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
 TEST = cmpver_test
diff --git a/tests/libxbps/cmpver/main.c b/tests/xbps/libxbps/cmpver/main.c
similarity index 100%
rename from tests/libxbps/cmpver/main.c
rename to tests/xbps/libxbps/cmpver/main.c
diff --git a/tests/libxbps/common/Kyuafile b/tests/xbps/libxbps/common/Kyuafile
similarity index 100%
rename from tests/libxbps/common/Kyuafile
rename to tests/xbps/libxbps/common/Kyuafile
diff --git a/tests/xbps-rindex/common/Makefile b/tests/xbps/libxbps/common/Makefile
similarity index 92%
rename from tests/xbps-rindex/common/Makefile
rename to tests/xbps/libxbps/common/Makefile
index 149e98bb..bffa6f94 100644
--- a/tests/xbps-rindex/common/Makefile
+++ b/tests/xbps/libxbps/common/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
 include ../Makefile.inc
diff --git a/tests/libxbps/find_pkg_obsoletes/Makefile b/tests/xbps/libxbps/find_pkg_obsoletes/Makefile
similarity index 84%
rename from tests/libxbps/find_pkg_obsoletes/Makefile
rename to tests/xbps/libxbps/find_pkg_obsoletes/Makefile
index 146a77f0..739f9ad1 100644
--- a/tests/libxbps/find_pkg_obsoletes/Makefile
+++ b/tests/xbps/libxbps/find_pkg_obsoletes/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
 TEST = find_pkg_obsoletes_test
diff --git a/tests/libxbps/find_pkg_obsoletes/main.c b/tests/xbps/libxbps/find_pkg_obsoletes/main.c
similarity index 100%
rename from tests/libxbps/find_pkg_obsoletes/main.c
rename to tests/xbps/libxbps/find_pkg_obsoletes/main.c
diff --git a/tests/libxbps/find_pkg_orphans/Kyuafile b/tests/xbps/libxbps/find_pkg_orphans/Kyuafile
similarity index 100%
rename from tests/libxbps/find_pkg_orphans/Kyuafile
rename to tests/xbps/libxbps/find_pkg_orphans/Kyuafile
diff --git a/tests/libxbps/find_pkg_orphans/Makefile b/tests/xbps/libxbps/find_pkg_orphans/Makefile
similarity index 66%
rename from tests/libxbps/find_pkg_orphans/Makefile
rename to tests/xbps/libxbps/find_pkg_orphans/Makefile
index 8c88960a..e986a44e 100644
--- a/tests/libxbps/find_pkg_orphans/Makefile
+++ b/tests/xbps/libxbps/find_pkg_orphans/Makefile
@@ -1,7 +1,7 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
-TESTSSUBDIR = libxbps/find_pkg_orphans
+TESTSSUBDIR = xbps/libxbps/find_pkg_orphans
 TEST = find_pkg_orphans_test
 EXTRA_FILES = Kyuafile pkgdb-0.21.plist
 
diff --git a/tests/libxbps/find_pkg_orphans/main.c b/tests/xbps/libxbps/find_pkg_orphans/main.c
similarity index 100%
rename from tests/libxbps/find_pkg_orphans/main.c
rename to tests/xbps/libxbps/find_pkg_orphans/main.c
diff --git a/tests/libxbps/find_pkg_orphans/pkgdb-0.21.plist b/tests/xbps/libxbps/find_pkg_orphans/pkgdb-0.21.plist
similarity index 100%
rename from tests/libxbps/find_pkg_orphans/pkgdb-0.21.plist
rename to tests/xbps/libxbps/find_pkg_orphans/pkgdb-0.21.plist
diff --git a/tests/libxbps/issue18/Makefile b/tests/xbps/libxbps/issue18/Makefile
similarity index 83%
rename from tests/libxbps/issue18/Makefile
rename to tests/xbps/libxbps/issue18/Makefile
index c5c0e00a..34ebb055 100644
--- a/tests/libxbps/issue18/Makefile
+++ b/tests/xbps/libxbps/issue18/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
 TEST = issue18_test
diff --git a/tests/libxbps/issue18/issue18_test.sh b/tests/xbps/libxbps/issue18/issue18_test.sh
similarity index 100%
rename from tests/libxbps/issue18/issue18_test.sh
rename to tests/xbps/libxbps/issue18/issue18_test.sh
diff --git a/tests/libxbps/pkgdb/Kyuafile b/tests/xbps/libxbps/pkgdb/Kyuafile
similarity index 100%
rename from tests/libxbps/pkgdb/Kyuafile
rename to tests/xbps/libxbps/pkgdb/Kyuafile
diff --git a/tests/libxbps/pkgdb/Makefile b/tests/xbps/libxbps/pkgdb/Makefile
similarity index 68%
rename from tests/libxbps/pkgdb/Makefile
rename to tests/xbps/libxbps/pkgdb/Makefile
index 12739f5a..c1eea1ac 100644
--- a/tests/libxbps/pkgdb/Makefile
+++ b/tests/xbps/libxbps/pkgdb/Makefile
@@ -1,7 +1,7 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
-TESTSSUBDIR = libxbps/pkgdb
+TESTSSUBDIR = xbps/libxbps/pkgdb
 TEST = pkgdb_test
 EXTRA_FILES = Kyuafile pkgdb-0.21.plist
 
diff --git a/tests/libxbps/pkgdb/main.c b/tests/xbps/libxbps/pkgdb/main.c
similarity index 100%
rename from tests/libxbps/pkgdb/main.c
rename to tests/xbps/libxbps/pkgdb/main.c
diff --git a/tests/libxbps/pkgdb/pkgdb-0.21.plist b/tests/xbps/libxbps/pkgdb/pkgdb-0.21.plist
similarity index 100%
rename from tests/libxbps/pkgdb/pkgdb-0.21.plist
rename to tests/xbps/libxbps/pkgdb/pkgdb-0.21.plist
diff --git a/tests/libxbps/pkgpattern_match/Makefile b/tests/xbps/libxbps/pkgpattern_match/Makefile
similarity index 84%
rename from tests/libxbps/pkgpattern_match/Makefile
rename to tests/xbps/libxbps/pkgpattern_match/Makefile
index fc24f199..52ada419 100644
--- a/tests/libxbps/pkgpattern_match/Makefile
+++ b/tests/xbps/libxbps/pkgpattern_match/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
 TEST = pkgpattern_match_test
diff --git a/tests/libxbps/pkgpattern_match/main.c b/tests/xbps/libxbps/pkgpattern_match/main.c
similarity index 100%
rename from tests/libxbps/pkgpattern_match/main.c
rename to tests/xbps/libxbps/pkgpattern_match/main.c
diff --git a/tests/libxbps/plist_match/Makefile b/tests/xbps/libxbps/plist_match/Makefile
similarity index 83%
rename from tests/libxbps/plist_match/Makefile
rename to tests/xbps/libxbps/plist_match/Makefile
index c7270f6d..685b94d9 100644
--- a/tests/libxbps/plist_match/Makefile
+++ b/tests/xbps/libxbps/plist_match/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
 TEST = plist_match_test
diff --git a/tests/libxbps/plist_match/main.c b/tests/xbps/libxbps/plist_match/main.c
similarity index 100%
rename from tests/libxbps/plist_match/main.c
rename to tests/xbps/libxbps/plist_match/main.c
diff --git a/tests/libxbps/plist_match_virtual/Makefile b/tests/xbps/libxbps/plist_match_virtual/Makefile
similarity index 84%
rename from tests/libxbps/plist_match_virtual/Makefile
rename to tests/xbps/libxbps/plist_match_virtual/Makefile
index 8b7f408d..ba360169 100644
--- a/tests/libxbps/plist_match_virtual/Makefile
+++ b/tests/xbps/libxbps/plist_match_virtual/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
 TEST = plist_match_virtual_test
diff --git a/tests/libxbps/plist_match_virtual/main.c b/tests/xbps/libxbps/plist_match_virtual/main.c
similarity index 100%
rename from tests/libxbps/plist_match_virtual/main.c
rename to tests/xbps/libxbps/plist_match_virtual/main.c
diff --git a/tests/libxbps/util/Makefile b/tests/xbps/libxbps/util/Makefile
similarity index 82%
rename from tests/libxbps/util/Makefile
rename to tests/xbps/libxbps/util/Makefile
index 1a67815f..410f3be4 100644
--- a/tests/libxbps/util/Makefile
+++ b/tests/xbps/libxbps/util/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
 TEST = util_test
diff --git a/tests/libxbps/util/main.c b/tests/xbps/libxbps/util/main.c
similarity index 100%
rename from tests/libxbps/util/main.c
rename to tests/xbps/libxbps/util/main.c
diff --git a/tests/xbps/xbps-rindex/Makefile b/tests/xbps/xbps-rindex/Makefile
new file mode 100644
index 00000000..b66302ba
--- /dev/null
+++ b/tests/xbps/xbps-rindex/Makefile
@@ -0,0 +1,5 @@
+-include ../../../config.mk
+
+SUBDIRS = common issue19
+
+include ../../../mk/subdir.mk
diff --git a/tests/xbps/xbps-rindex/Makefile.inc b/tests/xbps/xbps-rindex/Makefile.inc
new file mode 100644
index 00000000..c0e29f85
--- /dev/null
+++ b/tests/xbps/xbps-rindex/Makefile.inc
@@ -0,0 +1 @@
+TESTSSUBDIR = xbps/xbps-rindex
diff --git a/tests/xbps-rindex/common/Kyuafile b/tests/xbps/xbps-rindex/common/Kyuafile
similarity index 100%
rename from tests/xbps-rindex/common/Kyuafile
rename to tests/xbps/xbps-rindex/common/Kyuafile
diff --git a/tests/libxbps/common/Makefile b/tests/xbps/xbps-rindex/common/Makefile
similarity index 92%
rename from tests/libxbps/common/Makefile
rename to tests/xbps/xbps-rindex/common/Makefile
index 149e98bb..bffa6f94 100644
--- a/tests/libxbps/common/Makefile
+++ b/tests/xbps/xbps-rindex/common/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
 include ../Makefile.inc
diff --git a/tests/xbps-rindex/issue19/Makefile b/tests/xbps/xbps-rindex/issue19/Makefile
similarity index 83%
rename from tests/xbps-rindex/issue19/Makefile
rename to tests/xbps/xbps-rindex/issue19/Makefile
index 58765190..f1842a9a 100644
--- a/tests/xbps-rindex/issue19/Makefile
+++ b/tests/xbps/xbps-rindex/issue19/Makefile
@@ -1,4 +1,4 @@
-TOPDIR = ../../..
+TOPDIR = ../../../..
 -include $(TOPDIR)/config.mk
 
 TEST = issue19_test
diff --git a/tests/xbps-rindex/issue19/issue19_test.sh b/tests/xbps/xbps-rindex/issue19/issue19_test.sh
similarity index 100%
rename from tests/xbps-rindex/issue19/issue19_test.sh
rename to tests/xbps/xbps-rindex/issue19/issue19_test.sh