2 files changed, 4 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 571ff3ccc..8d7ca8f6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ openssh (1:7.4p1-3) UNRELEASED; urgency=medium
   * Run regression tests using 'sh -x' to try to get more information about
     failures.
   * Dump some useful log files if regression tests fail.
+  * Tweak regression test setup to cope with the case where some of the
+    source directory is unreadable by the openssh-tests user.
 
  -- Colin Watson <cjwatson@debian.org>  Sat, 31 Dec 2016 01:22:48 +0000
 
diff --git a/debian/tests/regress b/debian/tests/regress
index f3352e3d2..1576da97b 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -19,14 +19,14 @@ openssh-tests ALL = (ALL:ALL) NOPASSWD: ALL
 EOF
         chmod 440 /etc/sudoers.d/openssh-tests
         mkdir -p "$TMP"
-        chown openssh-tests:openssh-tests "$TMP"
+        cp -a . "$TMP/tree"
+        chown -R openssh-tests:openssh-tests "$TMP"
         sudo -u openssh-tests env TMP="$TMP" "$0" "$@"
         exit "$?"
 fi
 
 # Don't use "make tests"; we want to test the installed version.
 
-cp -a . "$TMP/tree"
 cd "$TMP/tree"
 
 # We aren't actually going to use most of this build, but we need a basic