diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index 133317c009f62f27ecaa4344d7a50235a73fcfaf..3d19162e9792210c8cadae9242e15406a6520120 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -7,12 +7,14 @@ CFLAGS = @CFLAGS@ -O0
 # Tests that can be used without any special setup.
 TS_PROGS = arcfour-test des-test rijndael-test twofish-test \
            md5-test sha1-test rsa-test dsa-test spki-tag-test
-TS_SH = conv-test keygen-test keygen-2-test
+TS_SH = conv-1-test conv-2-test keygen-1-test keygen-2-test \
+	write-key-1-test write-key-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-cat-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-cat-test tcpip-local-test tcpip-remote-test
 TS_MORE_PROGS =
 
 TS_ALL = $(TS_PROGS) $(TS_SH) $(TS_MORE_PROGS) $(TS_MORE_SH)