diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index 165d1b159766e5feefd94f8574ab6c715bd05d0e..f0729c18358efa2c251dcab89ea7adef52083276 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -12,8 +12,10 @@ TS_SH = conv-1-test conv-2-test export-1-test keygen-1-test keygen-2-test \
 TS_SOME = $(TS_PROGS) $(TS_SH)
 
 # Tests that require that lsh is set up for password-less login.
-TS_MORE_SH = lsh-1-test lsh-2-test lsh-3-test lsh-4-test lsh-5-test lsh-6-test \
-	lsh-cat-test lshg-cat-test lshg-cat-2-test tcpip-local-test tcpip-remote-test \
+TS_MORE_SH = lsh-1-test lsh-2-test lsh-3-test lsh-4-test \
+	lsh-5-test lsh-6-test lsh-7-test \
+	lsh-cat-test lshg-cat-test lshg-cat-2-test \
+	tcpip-local-test tcpip-remote-test \
 	lshg-tcpip-local-test ssh1-fallback-test
 TS_MORE_PROGS =
 
diff --git a/src/testsuite/lsh-7-test b/src/testsuite/lsh-7-test
new file mode 100755
index 0000000000000000000000000000000000000000..f2712d8ead188d93bb8012d49a8734374309ad81
--- /dev/null
+++ b/src/testsuite/lsh-7-test
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+# Checks that connection fails if we don't have an known_hosts file
+echo lsh, test 7
+
+if [ -z "$srcdir" ] ; then
+  srcdir=`pwd`
+fi
+
+. $srcdir/functions.sh
+
+spawn_lshd && ! ../lsh -nt --host-db=/dev/null $LSH_FLAGS -p $PORT localhost true \
+	   && test_success