diff --git a/aerodynamic_analysis/CMakeLists.txt b/aerodynamic_analysis/CMakeLists.txt
index 6d50a46beafc87b17e0f859beee63bd091720449..64fca1f84b9a2c69daae887da4b1c05b173cc4b9 100644
--- a/aerodynamic_analysis/CMakeLists.txt
+++ b/aerodynamic_analysis/CMakeLists.txt
@@ -61,10 +61,9 @@ set_target_properties(${MODULE_NAME} PROPERTIES
 )
 
 # Add the tests if enabled
-if(BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
     add_subdirectory(test)
 endif()
-
 # Download LiftingLine
 add_subdirectory(LiftingLine)
 
diff --git a/create_mission_xml/CMakeLists.txt b/create_mission_xml/CMakeLists.txt
index 97818101dd80acd13b165e52cb7b5fe541733ab2..f09a4673d0f66d6f292142cb357c32e0a9dace77 100644
--- a/create_mission_xml/CMakeLists.txt
+++ b/create_mission_xml/CMakeLists.txt
@@ -44,7 +44,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
 )
 
 # Add the tests if enabled
-if(BUILD_BLACKBOXTESTS OR BUILD_UNITTESTS)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
     add_subdirectory(test)
 endif()
 
diff --git a/ecological_assessment/CMakeLists.txt b/ecological_assessment/CMakeLists.txt
index 498d8d5c5cbf182f7696b05239ef8b90e7fab3c3..5dd681a669bf54ca0cb45f7f2c1acb3b38219776 100644
--- a/ecological_assessment/CMakeLists.txt
+++ b/ecological_assessment/CMakeLists.txt
@@ -88,7 +88,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
 )
 
 # Add the tests if enabled
-if(BUILD_BLACKBOXTESTS OR BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
     add_subdirectory(test)
 endif()
 
diff --git a/ecological_assessment/test/CMakeLists.txt b/ecological_assessment/test/CMakeLists.txt
index 0b3e6aadcf17b8f149a59466e8292dbc831a8639..ec986f28d7e4712b5b2b7f32a726b00b211afb63 100644
--- a/ecological_assessment/test/CMakeLists.txt
+++ b/ecological_assessment/test/CMakeLists.txt
@@ -13,15 +13,13 @@ if (BUILD_BLACKBOXTESTS)
     # Link the test executable against UNICADO libs and gtest
     target_link_libraries(blackbox_${MODULE_NAME}
         PRIVATE
-			UnicadoLibs::runtimeInfo
-			UnicadoLibs::standardFiles
-			UnicadoLibs::aixml
-			UnicadoLibs::unitConversion
-			UnicadoLibs::aircraftGeometry
-			UnicadoLibs::engine
-			UnicadoLibs::moduleBasics
-			UnicadoLibs::svgPlot
-			UnicadoLibs::atmosphere
+            UnicadoLibs::runtimeInfo
+            UnicadoLibs::standardFiles
+            UnicadoLibs::aixml
+            UnicadoLibs::unitConversion
+            UnicadoLibs::engine
+            UnicadoLibs::moduleBasics
+            UnicadoLibs::atmosphere
             Matplot++::matplot
             GTest::gtest
             UnicadoLibs::blackboxTest
diff --git a/empennage_design/CMakeLists.txt b/empennage_design/CMakeLists.txt
index 3cadc1056d825d5370fbd2821a5c8883f7a30c61..7101e065b6fc3fef59794e12b7f3307064658632 100644
--- a/empennage_design/CMakeLists.txt
+++ b/empennage_design/CMakeLists.txt
@@ -85,7 +85,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
 )
 
 # Add the tests if enabled
-if(BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
     add_subdirectory(test)
 endif()
 
diff --git a/initial_sizing/CMakeLists.txt b/initial_sizing/CMakeLists.txt
index 17d33e206f4aac0f646bf5f7b397b90b59f5d15e..c243fdb72e2f58ad566d5931f54e7728ffd7bee5 100644
--- a/initial_sizing/CMakeLists.txt
+++ b/initial_sizing/CMakeLists.txt
@@ -45,7 +45,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
     RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}$<0:>
 )
 # Add the tests if enabled
-if(BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
     add_subdirectory(test)
 endif()
 
diff --git a/mission_analysis/CMakeLists.txt b/mission_analysis/CMakeLists.txt
index 2945dd6dd564ea644c36766b054dd5965c31d1ff..c957d3d9a85f75b7667293f822f84fba5056ba1d 100644
--- a/mission_analysis/CMakeLists.txt
+++ b/mission_analysis/CMakeLists.txt
@@ -48,7 +48,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
 )
 
 # Add the tests if enabled
-if(BUILD_BLACKBOXTESTS OR BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
     add_subdirectory(test)
 endif()
 
diff --git a/performance_assessment/CMakeLists.txt b/performance_assessment/CMakeLists.txt
index ce8e303a701ca1fe0a80e340e11ca54edf239cb1..c20a9dfcb05161392e012e8a14d2ccbace7d355d 100644
--- a/performance_assessment/CMakeLists.txt
+++ b/performance_assessment/CMakeLists.txt
@@ -55,7 +55,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
 )
 
 # Add the tests if enabled
-if(BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
     add_subdirectory(test)
 endif()
 
diff --git a/wing_design/CMakeLists.txt b/wing_design/CMakeLists.txt
index 2fec82f3662654ceed28f3694025b2351178b8d6..18a360eaa84e95e9a62622647e010fe335b77a5f 100644
--- a/wing_design/CMakeLists.txt
+++ b/wing_design/CMakeLists.txt
@@ -85,7 +85,7 @@ set_target_properties(${MODULE_NAME} PROPERTIES
 )
 
 # Add the tests if enabled
-if(BUILD_UNITTEST)
+if((BUILD_UNITTEST OR BUILD_BLACKBOXTESTS) AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
     add_subdirectory(test)
 endif()