diff --git a/libs/blueprint/CMakeLists.txt b/libs/blueprint/CMakeLists.txt
index 43c0cf3d0..ec7952e3d 100644
--- a/libs/blueprint/CMakeLists.txt
+++ b/libs/blueprint/CMakeLists.txt
@@ -6,7 +6,6 @@ option(CMAKE_ENABLE_TESTS "Enable tests" FALSE) # used by CMTest module
 option(BUILD_EXAMPLES "Build examples" FALSE)
 
 find_package(CM)
-find_package(crypto3 REQUIRED)
 find_package(Boost REQUIRED COMPONENTS container random filesystem log log_setup program_options thread system)
 
 
@@ -21,7 +20,6 @@ target_include_directories(blueprint INTERFACE
 
 target_link_libraries(blueprint INTERFACE
                       ${Boost_LIBRARIES}
-                      crypto3::all
 )
 
 include(CMTest)
diff --git a/libs/blueprint/test/CMakeLists.txt b/libs/blueprint/test/CMakeLists.txt
index 388f5aa4a..35f2a2483 100644
--- a/libs/blueprint/test/CMakeLists.txt
+++ b/libs/blueprint/test/CMakeLists.txt
@@ -11,12 +11,6 @@ include(CMTest)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
 
-find_package(Boost REQUIRED COMPONENTS random unit_test_framework)
-
-cm_test_link_libraries(blueprint
-                       crypto3::all
-                       ${Boost_LIBRARIES})
-
 option(ZK_PLACEHOLDER_PROFILING "Build with placeholder profiling" FALSE)
 option(ZK_PLACEHOLDER_DEBUG "Build with placeholder debug output" FALSE)
 
@@ -53,11 +47,10 @@ macro(define_blueprint_test test)
     cm_test(NAME ${full_test_name} SOURCES ${test}.cpp ARGS ${additional_args})
 
     target_include_directories(${full_test_name} PRIVATE
-                               "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-                               "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>"
-
                                ${Boost_INCLUDE_DIRS})
 
+    target_link_libraries(${full_test_name} crypto3::blueprint crypto3::algebra crypto3::zk)
+
     set_target_properties(${full_test_name} PROPERTIES CXX_STANDARD 17)
 
     if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")