diff --git a/Makefile b/Makefile
index fcbf7cd8..46dfbaf5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ bin = $@/target/debug/$@
 doc-crate-toml=./.imag-documentation/Cargo.toml
 
 ECHO=$(shell which echo) -e
+MAKE=$(shell which make)
 BASH=$(shell which bash)
 CARGO=$(shell which cargo)
 
@@ -69,7 +70,7 @@ $(TARGETS): %: .FORCE
 
 $(BIN_TARGET_TESTS): %: .FORCE
 	@$(ECHO) "\t[BINTEST]:\t$@"
-	$(shell find $(subst -test,,$@) -name "*test.sh" -exec $(BASH) {} \;)
+	find $(subst -test,,$@) -name "tests" -type d -exec $(MAKE) -j 1 -C {} \;
 
 $(RELEASE_TARGETS): %: .FORCE
 	@$(ECHO) "\t[RELEASE]:\t$(subst -release,,$@)"
diff --git a/imag-link/tests/Makefile b/imag-link/tests/Makefile
new file mode 100644
index 00000000..2713587a
--- /dev/null
+++ b/imag-link/tests/Makefile
@@ -0,0 +1,13 @@
+ECHO=$(shell which echo) -e
+TARGETS=$(shell find -name "*test.sh" -type f)
+BASH=$(shell which bash)
+
+all: $(TARGETS)
+	@$(ECHO) $(TARGETS)
+
+$(TARGETS): %: .FORCE
+	@$(ECHO) "\t[BASH   ]:\t$@"
+	@$(BASH) $@
+
+.FORCE:
+