diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index 6c63aecd..c8f5962b 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -2,4 +2,5 @@ project(clienttests C)
 
 #add_check_test(torture_algorithms torture_algorithms.c ${TORTURE_LIBRARY})
 #add_check_test(torture_auth torture_auth.c ${TORTURE_LIBRARY})
+#add_check_test(torture_knownhosts torture_knownhosts.c ${TORTURE_LIBRARY})
 #add_check_test(torture_proxycommand torture_proxycommand.c ${TORTURE_LIBRARY})
diff --git a/tests/unittests/torture_knownhosts.c b/tests/client/torture_knownhosts.c
similarity index 99%
rename from tests/unittests/torture_knownhosts.c
rename to tests/client/torture_knownhosts.c
index 42a9916f..c9562583 100644
--- a/tests/unittests/torture_knownhosts.c
+++ b/tests/client/torture_knownhosts.c
@@ -88,4 +88,3 @@ Suite *torture_make_suite(void) {
           torture_knownhosts_port, setup, teardown);
   return s;
 }
-
diff --git a/tests/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt
index 58c60961..7d4f9c5b 100644
--- a/tests/unittests/CMakeLists.txt
+++ b/tests/unittests/CMakeLists.txt
@@ -4,7 +4,6 @@ add_cmockery_test(torture_buffer torture_buffer.c ${TORTURE_LIBRARY})
 add_cmockery_test(torture_callbacks torture_callbacks.c ${TORTURE_LIBRARY})
 add_cmockery_test(torture_init torture_init.c ${TORTURE_LIBRARY})
 add_cmockery_test(torture_keyfiles torture_keyfiles.c ${TORTURE_LIBRARY})
-#add_check_test(torture_knownhosts torture_knownhosts.c ${TORTURE_LIBRARY})
 #add_check_test(torture_list torture_list.c ${TORTURE_LIBRARY})
 #add_check_test(torture_misc torture_misc.c ${TORTURE_LIBRARY})
 #add_check_test(torture_options torture_options.c ${TORTURE_LIBRARY})