diff --git a/.gitignore b/.gitignore
index 0dbfdbf5..c9a94fb2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,5 @@ doc/xbps_api_doxyfile
 ftperr.h
 httperr.h
 tests/*/*/*/*_test
+tests/*/*/*_test
 include/xbps.h
diff --git a/mk/test.mk b/mk/test.mk
index 8fec2c3c..fc990d16 100644
--- a/mk/test.mk
+++ b/mk/test.mk
@@ -3,16 +3,21 @@
 OBJS	?= main.o
 
 .PHONY: all
-all: $(TEST)
+all: $(TEST) $(TESTSHELL)
 
 .PHONY: clean
 clean:
-	-rm -f $(TEST) $(OBJS)
+	-rm -f $(TEST) $(TESTSHELL) $(OBJS)
 
 .PHONY: install
-install: all
+install:
 	install -d $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
+ifdef TEST
 	install -m755 $(TEST) $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
+endif
+ifdef TESTSHELL
+	install -m755 $(TESTSHELL) $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
+endif
 ifdef EXTRA_FILES
 	for f in $(EXTRA_FILES); do \
 		install -m644 $${f} $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR); \
@@ -22,6 +27,7 @@ endif
 .PHONY: uninstall
 uninstall:
 	-rm -f $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)/$(TEST)
+	-rm -f $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)/$(TESTSHELL)
 
 %.o: %.c
 	@printf " [CC]\t\t$@\n"
diff --git a/tests/xbps/xbps-rindex/common/Kyuafile b/tests/xbps/xbps-rindex/Kyuafile
similarity index 100%
rename from tests/xbps/xbps-rindex/common/Kyuafile
rename to tests/xbps/xbps-rindex/Kyuafile
diff --git a/tests/xbps/xbps-rindex/Makefile b/tests/xbps/xbps-rindex/Makefile
index 6e339243..b31c71ca 100644
--- a/tests/xbps/xbps-rindex/Makefile
+++ b/tests/xbps/xbps-rindex/Makefile
@@ -1,5 +1,8 @@
--include ../../../config.mk
+TOPDIR = ../../..
+-include $(TOPDIR)/config.mk
 
-SUBDIRS = common clean
+TESTSHELL = clean_test
+TESTSSUBDIR = xbps/xbps-rindex
+EXTRA_FILES = Kyuafile
 
-include ../../../mk/subdir.mk
+include $(TOPDIR)/mk/test.mk
diff --git a/tests/xbps/xbps-rindex/Makefile.inc b/tests/xbps/xbps-rindex/Makefile.inc
deleted file mode 100644
index c0e29f85..00000000
--- a/tests/xbps/xbps-rindex/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-TESTSSUBDIR = xbps/xbps-rindex
diff --git a/tests/xbps/xbps-rindex/clean/Makefile b/tests/xbps/xbps-rindex/clean/Makefile
deleted file mode 100644
index 1b15b12c..00000000
--- a/tests/xbps/xbps-rindex/clean/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TOPDIR = ../../../..
--include $(TOPDIR)/config.mk
-
-TEST = clean_test
-
-include ../Makefile.inc
-include $(TOPDIR)/mk/test-shell.mk
diff --git a/tests/xbps/xbps-rindex/clean/clean_test.sh b/tests/xbps/xbps-rindex/clean_test.sh
similarity index 100%
rename from tests/xbps/xbps-rindex/clean/clean_test.sh
rename to tests/xbps/xbps-rindex/clean_test.sh
diff --git a/tests/xbps/xbps-rindex/common/Makefile b/tests/xbps/xbps-rindex/common/Makefile
deleted file mode 100644
index bffa6f94..00000000
--- a/tests/xbps/xbps-rindex/common/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-TOPDIR = ../../../..
--include $(TOPDIR)/config.mk
-
-include ../Makefile.inc
-
-all:
-
-install:
-	install -d $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
-	install -m644 Kyuafile $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)
-
-uninstall:
-	-rm -f $(DESTDIR)$(TESTSDIR)/$(TESTSSUBDIR)/Kyuafile
-
-clean: