diff --git a/.gitignore b/.gitignore
index 15e5be1913b30e559d17da257dbeaacc50b3ea69..1605632abb48c1122adf22c5b76c55c773889a6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ CA*
 users/
 hosts/
 .server.pid
+known_hosts
diff --git a/Makefile b/Makefile
index ef07667d3f7f85d2cf9fe7e69dcafbcc2771e00c..f9d4d6ad6a75a28939b86373966ce9a4c0c8ad10 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,12 @@ install:
 	chmod 755 /usr/local/bin/ssh-ca
 
 clean:
-	rm -rf CA CA.pub users hosts
+	rm -rf CA CA.pub users hosts known_hosts
 
 test: clean
 	./ssh-ca init
 	./ssh-ca newuser $$USER
 	./ssh-ca newhost localhost
+	echo "@cert-authority * $$(cat CA.pub)" > known_hosts
 	$$(which sshd) -dddf sshd_config
+	#ssh -F ssh_config test
diff --git a/ssh_config b/ssh_config
new file mode 100644
index 0000000000000000000000000000000000000000..a841a3b3f28d1deed246e800cb3e67e632787942
--- /dev/null
+++ b/ssh_config
@@ -0,0 +1,6 @@
+Host test
+HostName localhost
+Port 22222
+IdentityFile users/%u
+UserKnownHostsFile known_hosts
+StrictHostKeyChecking yes
diff --git a/sshd_config b/sshd_config
index 9784d3199824ebf4a720b0391316430a2c28a893..b9d519837e9ddd41835722f66d994ba3b325a340 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,7 +1,7 @@
 ListenAddress 127.0.0.1:22222
 HostKey hosts/localhost
 TrustedUserCAKeys ssh_ca.pub
-HostCertificate hosts/localhost.pub
+HostCertificate hosts/localhost-cert.pub
 Banner "ssh-ca dummy test daemon"
 PasswordAuthentication no
 PermitRootLogin no