diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b8190ec..a59783b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -367,7 +367,11 @@ if(EIVE_ADD_LINUX_FILES)
   add_subdirectory(${LINUX_PATH})
 endif()
 add_subdirectory(${BSP_PATH})
-add_subdirectory(${LIB_GOMSPACE_PATH})
+
+if(UNIX)
+  add_subdirectory(${LIB_GOMSPACE_PATH})
+endif()
+
 add_subdirectory(${COMMON_PATH})
 add_subdirectory(${DUMMY_PATH})
 
@@ -452,8 +456,7 @@ if(TGT_BSP MATCHES "arm/q7s")
 endif()
 
 target_link_libraries(
-  ${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION} rapidcsv ${LIB_DUMMIES}
-                           ${LIB_GOMSPACE_CLIENTS})
+  ${UNITTEST_NAME} PRIVATE Catch2 ${LIB_EIVE_MISSION} rapidcsv ${LIB_DUMMIES})
 
 if(TGT_BSP MATCHES "arm/egse")
   target_link_libraries(${OBSW_NAME} PRIVATE ${LIB_ARCSEC})