diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4decca0..37ed82d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -23,16 +23,13 @@ if(COMPILER_SUPPORTS_WPEDANTIC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic")
 endif()
 
-set(test_library_dependencies)
-find_library(BOOST_UNITTEST_FRAMEWORK_LIBRARY boost_unit_test_framework)
-if (BOOST_UNITTEST_FRAMEWORK_LIBRARY)
-    add_definitions(-DBOOST_TEST_DYN_LINK)
-    add_definitions(-DUNITTEST_FRAMEWORK_LIBRARY_EXIST)
-    set(test_library_dependencies boost_unit_test_framework)
-endif()
+find_package(Boost COMPONENTS unit_test_framework REQUIRED)
+add_definitions(-DBOOST_TEST_DYN_LINK)
+add_definitions(-DUNITTEST_FRAMEWORK_LIBRARY_EXIST)
 
 foreach(TEST_NAME ${TEST_NAMES})
     add_executable(${TEST_NAME} ${TEST_NAME}.cpp)
-    target_link_libraries(${TEST_NAME} ${test_library_dependencies})
+    target_link_libraries(${TEST_NAME} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+    target_include_directories(${TEST_NAME} PRIVATE ${Boost_INCLUDE_DIRS})
     add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/build)
 endforeach(TEST_NAME)