diff --git a/scripts/spacecheck.pl b/scripts/spacecheck.pl
index 77639efb..cb916560 100755
--- a/scripts/spacecheck.pl
+++ b/scripts/spacecheck.pl
@@ -41,6 +41,7 @@ my @need_crlf = (
 
 my @trailing_ws = (
     'tests/keys/.+\.pub$',
+    'tests/openssh_server/.+\.pub$',
     'tests/openssh_server/authorized_keys$',
 );
 
@@ -50,6 +51,7 @@ my @double_empty_lines = (
 my @longline = (
     '^libssh2-style\.el$',
     'tests/keys/.+\.pub$',
+    'tests/openssh_server/.+\.pub$',
     'tests/openssh_server/authorized_keys$',
     'tests/openssh_server/ca_user_keys.pub$',
     'tests/openssh_server/sshd_config$',
diff --git a/tests/Makefile.inc b/tests/Makefile.inc
index dab5ade9..223c9e16 100644
--- a/tests/Makefile.inc
+++ b/tests/Makefile.inc
@@ -130,8 +130,11 @@ EXTRA_DIST = \
   openssh_server/authorized_keys \
   openssh_server/ca_user_keys.pub \
   openssh_server/ssh_host_ecdsa_key \
+  openssh_server/ssh_host_ecdsa_key.pub \
   openssh_server/ssh_host_ed25519_key \
+  openssh_server/ssh_host_ed25519_key.pub \
   openssh_server/ssh_host_rsa_key \
+  openssh_server/ssh_host_rsa_key.pub \
   openssh_server/sshd_config \
   test_read_algos.test \
   test_read_algos.txt \
diff --git a/tests/openssh_server/ssh_host_ecdsa_key.pub b/tests/openssh_server/ssh_host_ecdsa_key.pub
new file mode 100644
index 00000000..d63281de
--- /dev/null
+++ b/tests/openssh_server/ssh_host_ecdsa_key.pub
@@ -0,0 +1 @@
+ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC+/syyeKJD9dC2ZH9Q7iJGReR4YM3rUCMsSynkyXojdfSClGCMY7JvWlt30ESjYvxoTfSRGx6WvaqYK/vPoYQ4=
diff --git a/tests/openssh_server/ssh_host_ed25519_key b/tests/openssh_server/ssh_host_ed25519_key
index bfb1ad56..53a795bf 100644
--- a/tests/openssh_server/ssh_host_ed25519_key
+++ b/tests/openssh_server/ssh_host_ed25519_key
@@ -1,7 +1,7 @@
 -----BEGIN OPENSSH PRIVATE KEY-----
 b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACCMbXcoNmUVxO9FMMj1VB91MnwwVfBl+XDxet+j+oY6JgAAAJg8nvUxPJ71
-MQAAAAtzc2gtZWQyNTUxOQAAACCMbXcoNmUVxO9FMMj1VB91MnwwVfBl+XDxet+j+oY6Jg
-AAAECnhCuTDYdz3kUn48BXkaCXXdbKdH7wSIQ/CUx1cbnR0Ixtdyg2ZRXE70UwyPVUH3Uy
-fDBV8GX5cPF636P6hjomAAAAEHdpbGxAaUN1YmUubG9jYWwBAgMEBQ==
+QyNTUxOQAAACDuw4cf6Me16Iv7INhq0e49seTcb0xipzB98In3elDwsQAAAIg3ohLbN6IS
+2wAAAAtzc2gtZWQyNTUxOQAAACDuw4cf6Me16Iv7INhq0e49seTcb0xipzB98In3elDwsQ
+AAAEBvDkyjLO7cYyo8CIAytsI4UI0nihx/tGXGTNc+mG0vSe7Dhx/ox7Xoi/sg2GrR7j2x
+5NxvTGKnMH3wifd6UPCxAAAAAAECAwQF
 -----END OPENSSH PRIVATE KEY-----
diff --git a/tests/openssh_server/ssh_host_ed25519_key.pub b/tests/openssh_server/ssh_host_ed25519_key.pub
new file mode 100644
index 00000000..e2467d1d
--- /dev/null
+++ b/tests/openssh_server/ssh_host_ed25519_key.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO7Dhx/ox7Xoi/sg2GrR7j2x5NxvTGKnMH3wifd6UPCx 
diff --git a/tests/openssh_server/ssh_host_rsa_key.pub b/tests/openssh_server/ssh_host_rsa_key.pub
new file mode 100644
index 00000000..72de614c
--- /dev/null
+++ b/tests/openssh_server/ssh_host_rsa_key.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEArrr/JuJmaZligyfS8vcNur+mWR2ddDQtVdhHzdKUUoR6/Om6cvxpe61H1YZO1xCpLUBXmkki4HoNtYOpPB2W4V+8U4BDeVBD5crypEOE1+7BAm99fnEDxYIOZq2/jTP0yQmzCpWYS3COyFmkOL7sfX1wQMeW5zQT2WKcxC6FSWbhDqrBeNEGi687hJJoJ7YXgY/IdiYW5NcOuqRSWljjGS3dAJsHHWk4nJbhjEDXbPaeduMAwQU9i6ELfP3r+q6wdu0P4jWaoo3De1aYxnToV/ldXykpipON4NPamsb6Ph2qlJQKypq7J4iQgkIIbCU1A31+4ExvcIVoxLQw/aTSbw==
diff --git a/tests/test_hostkey.c b/tests/test_hostkey.c
index 8d5e8087..7ebcb3c9 100644
--- a/tests/test_hostkey.c
+++ b/tests/test_hostkey.c
@@ -18,7 +18,7 @@ static const char EXPECTED_ECDSA_HOSTKEY[] =
     "9Q7iJGReR4YM3rUCMsSynkyXojdfSClGCMY7JvWlt30ESjYvxoTfSRGx6WvaqYK/vPoYQ4=";
 
 static const char EXPECTED_ED25519_HOSTKEY[] =
-    "AAAAC3NzaC1lZDI1NTE5AAAAIIxtdyg2ZRXE70UwyPVUH3UyfDBV8GX5cPF636P6hjom";
+    "AAAAC3NzaC1lZDI1NTE5AAAAIO7Dhx/ox7Xoi/sg2GrR7j2x5NxvTGKnMH3wifd6UPCx";
 
 int test(LIBSSH2_SESSION *session)
 {
diff --git a/tests/test_hostkey_hash.c b/tests/test_hostkey_hash.c
index 9cbfdaab..9453753e 100644
--- a/tests/test_hostkey_hash.c
+++ b/tests/test_hostkey_hash.c
@@ -18,7 +18,7 @@ static const char *EXPECTED_ECDSA_HOSTKEY =
     "9Q7iJGReR4YM3rUCMsSynkyXojdfSClGCMY7JvWlt30ESjYvxoTfSRGx6WvaqYK/vPoYQ4=";
 
 static const char *EXPECTED_ED25519_HOSTKEY =
-    "AAAAC3NzaC1lZDI1NTE5AAAAIIxtdyg2ZRXE70UwyPVUH3UyfDBV8GX5cPF636P6hjom";
+    "AAAAC3NzaC1lZDI1NTE5AAAAIO7Dhx/ox7Xoi/sg2GrR7j2x5NxvTGKnMH3wifd6UPCx";
 
 #if LIBSSH2_MD5
 static const char *EXPECTED_RSA_MD5_HASH_DIGEST =
@@ -43,7 +43,7 @@ static const char *EXPECTED_ECDSA_SHA256_HASH_DIGEST =
     "56FCD975B166C3F0342D0036E44C311A86C0EAE40713B53FC776369BAE7F5264";
 
 static const char *EXPECTED_ED25519_SHA256_HASH_DIGEST =
-    "2638B020F6121FA750A7F4754B718419F621814C6E779D68ADF26AA68814ADDF";
+    "35578310E5AAE18186B89DD547C879550EE4534108BAEF87AC25CD5E37468B65";
 
 #if LIBSSH2_MD5
 #define MD5_HASH_SIZE     16