diff --git a/CMakeLists.txt b/CMakeLists.txt
index e9b1b68c..c8e345e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,8 @@ if(TGT_BSP MATCHES "arm/q7s")
     option(BUILD_Q7S_SIMPLE_MODE OFF "Simple mode with a minimal main function")
 endif()
 
-option(ADD_ETL_LIB "Add ETL library" ON)
+option(EIVE_BUILD_UNITTESTS "Build Catch2 unittests" OFF)
+option(EIVE_ADD_ETL_LIB "Add ETL library" ON)
 option(ADD_JSON_LIB "Add JSON library" ON)
 option(EIVE_SYSROOT_MAGIC "Perform sysroot magic which might not be necessary" OFF)
 
@@ -143,7 +144,7 @@ set(FSFW_ADDITIONAL_INC_PATHS
 # Add executable
 add_executable(${TARGET_NAME})
 
-if(ADD_ETL_LIB)
+if(EIVE_ADD_ETL_LIB)
     add_subdirectory(${ETL_LIB_PATH})
 endif()
 
@@ -203,7 +204,7 @@ if(NOT EIVE_BUILD_WATCHDOG)
     endif()
 endif()
 
-if(ADD_ETL_LIB)
+if(EIVE_ADD_ETL_LIB)
     target_link_libraries(${TARGET_NAME} PRIVATE
         ${LIB_ETL_NAME}
     )