diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 472382c7d25..0b14782f8f3 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -1168,8 +1168,19 @@ if EMBEDDED_UNIVALUE
 endif
 
 %.cpp.test: %.cpp
-	@echo Running tests: `cat $< | grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1` from $<
-	$(AM_V_at)$(TEST_BINARY) --catch_system_errors=no -l test_suite -t "`cat $< | grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1`" -- DEBUG_LOG_OUT > $<.log 2>&1 || (cat $<.log && false)
+	@echo Running tests: $$(\
+		cat $< | \
+		grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | \
+		cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1) \
+		from $<
+	$(AM_V_at)$(TEST_BINARY) \
+		--catch_system_errors=no -l test_suite -t "$$(\
+			cat $< | \
+			grep -E "(BOOST_FIXTURE_TEST_SUITE\\(|BOOST_AUTO_TEST_SUITE\\()" | \
+			cut -d '(' -f 2 | cut -d ',' -f 1 | cut -d ')' -f 1\
+		)" -- DEBUG_LOG_OUT > $(abs_builddir)/$$(\
+			echo $< | grep -E -o "(wallet/test/.*\.cpp|test/.*\.cpp)" | $(SED) -e s/\.cpp/.log/\
+		) 2>&1 || (cat $<.log && false)
 
 %.json.h: %.json
 	@$(MKDIR_P) $(@D)