3 files changed, 10 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index fd238ee51..246811ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:7.4p1-4) UNRELEASED; urgency=medium
+
+  * Run regression tests inside annotate-output to try to diagnose timeout
+    issues.
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 01 Jan 2017 14:32:26 +0000
+
 openssh (1:7.4p1-3) unstable; urgency=medium
 
   * Revert attempted hack around regress/forwarding.sh test failure, since
diff --git a/debian/tests/control b/debian/tests/control
index 62264efd5..df8f9b847 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,7 @@
 Tests: regress
 Restrictions: needs-root allow-stderr
-Depends: openssh-client,
+Depends: devscripts,
+         openssh-client,
          openssh-server,
          openssh-sftp-server,
          openssl,
diff --git a/debian/tests/regress b/debian/tests/regress
index 1576da97b..662526b54 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -46,7 +46,7 @@ make regress-binaries
 SRCDIR="$(pwd)"
 BUILDDIR="$SRCDIR"
 ret=0
-make -C regress \
+annotate-output +%H:%M:%S.%N make -C regress \
         .OBJDIR="$BUILDDIR/regress" \
         .CURDIR="$SRCDIR/regress" \
         BUILDDIR="$BUILDDIR" \