2 files changed, 7 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index c54e6826a..31de67bbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+openssh (1:7.1p1-2) UNRELEASED; urgency=medium
+
+  * Really enable conch interoperability tests under autopkgtest.
+
+ -- Colin Watson <cjwatson@debian.org>  Thu, 03 Dec 2015 11:59:32 +0000
+
 openssh (1:7.1p1-1) unstable; urgency=medium
 
   * New upstream release (http://www.openssh.com/txt/release-7.0, closes:
diff --git a/debian/tests/regress b/debian/tests/regress
index 010d94e73..6402def47 100644
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -37,6 +37,7 @@ make -C regress \
         SUDO=sudo \
         TEST_SHELL=sh \
         TEST_SSH_SFTPSERVER=/usr/lib/openssh/sftp-server \
+        TEST_SSH_CONCH=conch \
         TEST_SSH_IPV6=yes \
         TEST_SSH_ECC=yes \
         tests interop-tests