diff --git a/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.test b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.test
index 10fecd65..49f2cb75 100644
--- a/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.test
+++ b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.test
@@ -18,13 +18,9 @@ EOT
 		exit 1
 	fi
 ) 2>&1 > output
-echo '**************************************'
-echo '**************  hiero  ***************'
-echo '**************         ***************'
-awk '/^==.*(definitely|indirectly|possibly) lost/{print;if($4>0)exit(1)}' valgrind.log
-echo '**************         ***************'
-echo '**************  hiero  ***************'
-echo '**************************************'
-cat valgrind.log
-cat output
-exit 1
+if ! awk '/^==.*(definitely|indirectly|possibly) lost/{print;if($4>0)exit(1)}' valgrind.log
+then
+	cat valgrind.log
+	cat output
+	exit 1
+fi
diff --git a/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.test b/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.test
index 5a0ad456..94bd6d2f 100644
--- a/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.test
+++ b/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.test
@@ -13,9 +13,14 @@ qwerlkjhasdfpuiqwyerm.1234kjhrqwersv.com
 -H 2a04:b900:0:100::37
 EOT
 (
-	if !  "${BUILDDIR}/build-stub-only/libtool" exec valgrind -v --leak-check=full --error-exitcode=1 --track-origins=yes "${GETDNS_STUB_QUERY}" -F queries -f "${TPKG_NAME}.ds" +dnssec_return_validation_chain
+	if !  "${BUILDDIR}/build-stub-only/libtool" exec valgrind -v --log-file=valgrind.log --leak-check=full --error-exitcode=1 --track-origins=yes "${GETDNS_STUB_QUERY}" -F queries -f "${TPKG_NAME}.ds" +dnssec_return_validation_chain
 	then
 		exit 1
 	fi
-) 2>&1 | tee output
-awk '/^==.*(definitely|indirectly|possibly) lost/{print;if($4>0)exit(1)}' output
+) 2>&1 > output
+if ! awk '/^==.*(definitely|indirectly|possibly) lost/{print;if($4>0)exit(1)}' valgrind.log
+then
+	cat valgrind.log
+	cat output
+	exit 1
+fi
diff --git a/src/test/tpkg/run-all.sh b/src/test/tpkg/run-all.sh
index 242bc206..863500e1 100755
--- a/src/test/tpkg/run-all.sh
+++ b/src/test/tpkg/run-all.sh
@@ -3,7 +3,7 @@
 export SRCDIR=`dirname $0`
 . `dirname $0`/setup-env.sh
 
-for TEST_PKG in ${SRCDIR}/125-*.tpkg
+for TEST_PKG in ${SRCDIR}/*.tpkg
 do
 	"${TPKG}" $* exe "${TEST_PKG}"
 done