diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8a11a3..2619071 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -145,9 +145,11 @@ endif()
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 
-enable_testing()
 add_subdirectory(src)
-add_subdirectory(tst)
+if(BUILD_ETCD_TESTS)
+  enable_testing()
+  add_subdirectory(tst)
+endif()
 
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/etcd/Client.hpp
                ${CMAKE_CURRENT_SOURCE_DIR}/etcd/KeepAlive.hpp