diff --git a/autotools/gen-coverage b/autotools/gen-coverage
index f8f38658c6eb5ff9b16cb6d2d69ccb012899f255..8d6c2d47ec09b7b0efad41a1551db839eb88a121 100755
--- a/autotools/gen-coverage
+++ b/autotools/gen-coverage
@@ -24,10 +24,12 @@ set -e
 : ${PYTHON:=python}
 : ${COVERAGE_FILE:?}
 : ${TEXT_COVERAGE:?}
+: ${GANETI_TEMP_DIR:?}
 
-omit=$($PYTHON -c 'import sys;
-print " ".join(["--omit=%s/" % i for i in
-                set([sys.prefix, sys.exec_prefix])])')
+omit=$($PYTHON -c 'import sys; import os;
+print ",".join("%s/" % i for i in set([sys.prefix, sys.exec_prefix,
+   os.environ["GANETI_TEMP_DIR"] + "/test"]))')
+omit="--omit=$omit"
 
 $COVERAGE erase
 
diff --git a/autotools/run-in-tempdir b/autotools/run-in-tempdir
index 9cab50fa1f33e7fa44bd430e5863d2e510a2fbe3..4114346f7a3df1c555c4aae30a1a0577bb0696fc 100755
--- a/autotools/run-in-tempdir
+++ b/autotools/run-in-tempdir
@@ -8,4 +8,4 @@ trap "rm -rf $tmpdir" EXIT
 cp -r daemons scripts lib tools test $tmpdir
 mv $tmpdir/lib $tmpdir/ganeti
 
-cd $tmpdir && "$@"
+cd $tmpdir && GANETI_TEMP_DIR="$tmpdir" "$@"