diff --git a/DefineOptions.cmake b/DefineOptions.cmake
index 4b5d7930..d08c237f 100644
--- a/DefineOptions.cmake
+++ b/DefineOptions.cmake
@@ -13,6 +13,7 @@ option(WITH_PCAP "Compile with Pcap generation support" ON)
 option(WITH_INTERNAL_DOC "Compile doxygen internal documentation" OFF)
 option(UNIT_TESTING "Build with unit tests" OFF)
 option(CLIENT_TESTING "Build with client tests; requires openssh" OFF)
+option(SERVER_TESTING "Build with server tests; requires openssh and dropbear" OFF)
 option(WITH_BENCHMARKS "Build benchmarks tools" OFF)
 option(WITH_EXAMPLES "Build examples" ON)
 option(WITH_NACL "Build with libnacl (curve25519)" ON)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f0a809d6..e446f10b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -135,9 +135,9 @@ if (WITH_BENCHMARKS)
     add_subdirectory(benchmarks)
 endif (WITH_BENCHMARKS)
 
-if (WITH_SERVER)
+if (WITH_SERVER AND SERVER_TESTING)
     add_subdirectory(pkd)
-endif (WITH_SERVER)
+endif (WITH_SERVER AND SERVER_TESTING)
 
 if (FUZZ_TESTING)
     add_subdirectory(fuzz)