diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1750eac..10957d6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -31,18 +31,16 @@ if(${BUILD_TEST_STATIC_BOOST})
     set(Boost_USE_STATIC_LIBS ON)
     set(BUILD_SHARED_LIBS OFF)
     set(BOOST_DEFS "")
-    set(BUILD_TYPE STATIC)
 else()
     set(Boost_USE_STATIC_LIBS OFF)
     set(BUILD_SHARED_LIBS ON)
     set(BOOST_DEFS Boost::dynamic_linking)
-    set(BUILD_TYPE SHARED)
 endif()
 find_package(Boost REQUIRED COMPONENTS unit_test_framework)
 
 macro(addTest testName)
     add_executable(${testName} ${testName}.cpp)
-    target_link_libraries(${testName} PRIVATE ${PROJECT_NAME} Boost::unit_test_framework)
+    target_link_libraries(${testName} PRIVATE Boost::unit_test_framework Boost::disable_autolinking ${BOOST_DEFS} ${PROJECT_NAME})
     # Adding a project configuration file (for MSVC only)
     generate_msvc_dot_user_file(${testName})