diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10120a05..e95b689d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,10 +20,6 @@ endif()
 
 cm_project(assigner WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES C CXX)
 
-if(NOT Boost_FOUND AND NOT CMAKE_CROSSCOMPILING)
-    find_package(Boost COMPONENTS REQUIRED filesystem log log_setup program_options thread system)
-endif()
-
 cm_find_package(CM)
 include(CMDeploy)
 include(FindPkgConfig)
@@ -63,7 +59,6 @@ set_target_properties(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} PROPERTIES
 target_include_directories(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
                            "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
                            "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>"
-
                            ${Boost_INCLUDE_DIRS})
 
 target_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME} INTERFACE
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9a521a06..e2614a99 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,21 +9,9 @@
 
 include(CMTest)
 
-cm_find_package(Boost REQUIRED COMPONENTS log log_setup random unit_test_framework)
-
 cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}
 
-                       ${CMAKE_WORKSPACE_NAME}::algebra
-                       ${CMAKE_WORKSPACE_NAME}::blueprint
-                       ${CMAKE_WORKSPACE_NAME}::hash
-                       ${CMAKE_WORKSPACE_NAME}::math
-                       ${CMAKE_WORKSPACE_NAME}::multiprecision
-                       ${CMAKE_WORKSPACE_NAME}::random
-                       ${CMAKE_WORKSPACE_NAME}::zk
-                       marshalling::core
-                       marshalling::crypto3_algebra
-                       marshalling::crypto3_multiprecision
-                       marshalling::crypto3_zk
+                       crypto3::all
                        LLVMIRReader
                        LLVMCore
                        LLVMSupport