6 files changed, 20 insertions, 8 deletions
diff --git a/src/ipcpd/local/CMakeLists.txt b/src/ipcpd/local/CMakeLists.txt
index 08abff57..f661e9ae 100644
--- a/src/ipcpd/local/CMakeLists.txt
+++ b/src/ipcpd/local/CMakeLists.txt
@@ -31,4 +31,6 @@ endif ()
 install(TARGETS ipcpd-local RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
 
 # Enable once ipcp-local has tests
-# add_subdirectory(tests)
+# if(BUILD_TESTS)
+#   add_subdirectory(tests)
+# endif ()
diff --git a/src/ipcpd/unicast/CMakeLists.txt b/src/ipcpd/unicast/CMakeLists.txt
index ced045e6..a9155353 100644
--- a/src/ipcpd/unicast/CMakeLists.txt
+++ b/src/ipcpd/unicast/CMakeLists.txt
@@ -71,6 +71,8 @@ endif ()
 
 install(TARGETS ipcpd-unicast RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
 
-add_subdirectory(pff/tests)
-add_subdirectory(routing/tests)
-add_subdirectory(dir/tests)
+if(BUILD_TESTS)
+  add_subdirectory(pff/tests)
+  add_subdirectory(routing/tests)
+  add_subdirectory(dir/tests)
+endif ()
diff --git a/src/irmd/CMakeLists.txt b/src/irmd/CMakeLists.txt
index 46d49391..32904d59 100644
--- a/src/irmd/CMakeLists.txt
+++ b/src/irmd/CMakeLists.txt
@@ -109,4 +109,6 @@ endif ()
 install(TARGETS irmd RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
 
 add_subdirectory(reg)
-add_subdirectory(tests)
+if(BUILD_TESTS)
+  add_subdirectory(tests)
+endif ()
diff --git a/src/irmd/reg/CMakeLists.txt b/src/irmd/reg/CMakeLists.txt
index ff9d2e99..d3844908 100644
--- a/src/irmd/reg/CMakeLists.txt
+++ b/src/irmd/reg/CMakeLists.txt
@@ -4,4 +4,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR}/include)
 include_directories(${CMAKE_BINARY_DIR}/include)
 
-add_subdirectory(tests)
+if(BUILD_TESTS)
+  add_subdirectory(tests)
+endif ()
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 04a8f089..14e89976 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -333,4 +333,6 @@ target_include_directories(ouroboros-dev PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
 target_include_directories(ouroboros-irm PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
   ${SYS_RND_HDR} ${LIBGCRYPT_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
 
-add_subdirectory(tests)
+if(BUILD_TESTS)
+  add_subdirectory(tests)
+endif ()
diff --git a/src/tools/irm/CMakeLists.txt b/src/tools/irm/CMakeLists.txt
index 7acd5396..3c599300 100644
--- a/src/tools/irm/CMakeLists.txt
+++ b/src/tools/irm/CMakeLists.txt
@@ -39,4 +39,6 @@ target_link_libraries(irm LINK_PUBLIC ouroboros-irm)
 install(TARGETS irm RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR})
 
 # enable when we have tests
-# add_subdirectory(tests)
+# if(BUILD_TESTS)
+#   add_subdirectory(tests)
+# endif ()