diff --git a/src/test/tpkg/tpkg b/src/test/tpkg/tpkg
index 713adcfb..0eddaedb 100755
--- a/src/test/tpkg/tpkg
+++ b/src/test/tpkg/tpkg
@@ -197,6 +197,7 @@ function usage() {
 	out " -b DIR\tuse DIR is a base directory in stead of ."
 	out " -a ARGS\tpass the string ARGS through to the test scripts"
 	out " -d\t\tUse directories instead of tar.gz for tpkg archive format"
+	out " -f\t\tForce test to be re-run if already executed"
         out 
         out " (C) NLnetLabs, Miek Gieben. Licensed under the GPL version 2."
 }
@@ -858,9 +859,10 @@ echo "--------------- Test Output ------------------" | write_result result.$dsc
 pre
 
 out "[log] Executing test" 
-
-( ${SHELL} $dsc_test ${TPKG_ARGS} 2>&1 ) | write_result result.$dsc_basename
+( ${SHELL} $dsc_test ${TPKG_ARGS} 2>&1 ) > result.$dsc_basename.tmp
 test_result=$?
+write_result result.$dsc_basename < result.$dsc_basename.tmp
+rm -f result.$dsc_basename.tmp
 epoch   # would like to run after post, but that is not possible :-(
 if [ $test_result -ne 0 ]; then
         err "[warning] Test executed with errors: $test_result."