2 files changed, 3 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index bb0ef3fe1..870a32c74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openssh (1:7.5p1-9) UNRELEASED; urgency=medium
 
   * Run debian/tests/regress with "set -x".
+  * Run haveged without "-w 1024", as setting the low water mark doesn't
+    seem possible in all autopkgtest virtualisation environments.
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 30 Aug 2017 11:32:49 +0100
 
diff --git a/debian/tests/regress b/debian/tests/regress
index 701edf30e..e941be871 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -35,7 +35,7 @@ EOF
         if ! pidof haveged >/dev/null; then
                 start-stop-daemon --start --quiet \
                         --pidfile "$TMP/haveged.pid" \
-                        --exec /usr/sbin/haveged -- -w 1024
+                        --exec /usr/sbin/haveged
         fi
 
         sudo -u openssh-tests env TMP="$TMP" "$0" "$@"