diff --git a/debian/changelog b/debian/changelog
index c395f13..8f76fcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 patroni (1.4.2-2) UNRELEASED; urgency=medium
 
-  * 
+  [ Christoph Berg ]
+  * debian/tests: Tidy /tmp/pgpass?.
 
  -- Debian PostgreSQL Maintainers <pkg-postgresql-public@lists.alioth.debian.org>  Sat, 03 Feb 2018 14:09:20 +0100
 
diff --git a/debian/tests/acceptance b/debian/tests/acceptance
index 630dba3..fcdbff6 100755
--- a/debian/tests/acceptance
+++ b/debian/tests/acceptance
@@ -7,7 +7,7 @@ export LANG=C.UTF-8
 
 if [ $(id -u) -eq 0 ]
 then
-        # required so that the postgres user can create files
+        # required so that the postgres user can create .coverage* and features/output/
         chmod 777 .
         chmod 777 features
         SU='su postgres -p -c'
@@ -15,6 +15,10 @@ else
         SU='bash -c'
 fi
 
+# clean up afterwards
+trap 'rm -f /tmp/pgpass?' 0 2 3 15
+
+set -x
 for PG_VERSION in /usr/lib/postgresql/*; do
 	$SU "PATH=/usr/lib/postgresql/$(basename ${PG_VERSION})/bin:$PATH behave"
 done
diff --git a/debian/tests/test b/debian/tests/test
index 4525c9a..f56afe7 100755
--- a/debian/tests/test
+++ b/debian/tests/test
@@ -5,4 +5,7 @@ set -e
 export LC_ALL=C.UTF-8
 export LANG=C.UTF-8
 
+# clean up afterwards
+trap 'rm -f /tmp/pgpass?' 0 2 3 15
+
 python3 setup.py test