diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2bbf1fd..8f20b9b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,6 +15,10 @@ option(INTROSPECTION_THREADS "Build with threads introspection" OFF)
 option(LIB "System install" ON)
 option(STATIC_LIB OFF)
 option(DEBUG "Build with -g3" OFF)
+set(PIP_UTILS 1)
+if(LIBPROJECT)
+	set(PIP_UTILS ${UTILS})
+endif()
 
 
 # Basic
@@ -455,8 +459,10 @@ if (NOT PIP_FREERTOS)
 
 
 	# Test program
-	add_executable(pip_test "main.cpp")
-	target_link_libraries(pip_test pip)
+	if(PIP_UTILS)
+		add_executable(pip_test "main.cpp")
+		target_link_libraries(pip_test pip)
+	endif()
 	
 else(NOT PIP_FREERTOS)
 	message(STATUS "Building PIP with crypt support")
@@ -531,14 +537,16 @@ if(NOT PIP_FREERTOS)
 
 
 # Utils
-	add_subdirectory("utils/system_test")
-	add_subdirectory("utils/remote_console")
-	add_subdirectory("utils/code_model_generator")
-	add_subdirectory("utils/resources_compiler")
-	add_subdirectory("utils/udp_file_transfer")
-	if(sodium_FOUND)
-		add_subdirectory("utils/system_daemon")
-		add_subdirectory("utils/crypt_tool")
+	if(PIP_UTILS)
+		add_subdirectory("utils/system_test")
+		add_subdirectory("utils/remote_console")
+		add_subdirectory("utils/code_model_generator")
+		add_subdirectory("utils/resources_compiler")
+		add_subdirectory("utils/udp_file_transfer")
+		if(sodium_FOUND)
+			add_subdirectory("utils/system_daemon")
+			add_subdirectory("utils/crypt_tool")
+		endif()
 	endif()
 	
 endif()