From e643445a705425da923b875197505c7cc9f79195 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Thu, 14 Mar 2019 14:07:57 +0100
Subject: [PATCH] Use dynamic lib for boost test

---
 .../Tests/CommonHelpers/FloatComparisons.hpp  |  5 +-
 Tests/Core/Detector/CMakeLists.txt            |  6 +--
 .../Detector/TrackingGeometryClosureTests.cpp |  3 +-
 .../TrackingGeometryCreationTests.cpp         |  5 +-
 .../Detector/TrackingGeometryGeoIDTests.cpp   |  3 +-
 Tests/Core/EventData/BoundParametersTests.cpp |  3 +-
 Tests/Core/EventData/CMakeLists.txt           | 10 ++--
 .../EventData/CurvilinearParametersTests.cpp  |  3 +-
 Tests/Core/EventData/MeasurementTests.cpp     |  3 +-
 Tests/Core/EventData/ParameterSetTests.cpp    |  3 +-
 Tests/Core/EventData/ParametersTestHelper.hpp |  3 +-
 Tests/Core/EventData/TrackStateTests.cpp      |  3 +-
 Tests/Core/Extrapolator/CMakeLists.txt        |  8 ++--
 Tests/Core/Extrapolator/ExtrapolatorTests.cpp |  3 +-
 .../Extrapolator/KalmanExtrapolatorTests.cpp  |  5 +-
 .../Extrapolator/MaterialCollectionTests.cpp  |  3 +-
 Tests/Core/Extrapolator/NavigatorTests.cpp    |  3 +-
 Tests/Core/Fitter/CMakeLists.txt              |  4 +-
 Tests/Core/Fitter/GainMatrixTests.cpp         |  3 +-
 Tests/Core/Fitter/KalmanFitterTests.cpp       |  3 +-
 Tests/Core/Layers/CMakeLists.txt              | 16 +++----
 Tests/Core/Layers/ConeLayerTests.cpp          |  3 +-
 Tests/Core/Layers/CylinderLayerTests.cpp      |  3 +-
 Tests/Core/Layers/DiscLayerTests.cpp          |  3 +-
 .../Layers/GenericApproachDescriptorTests.cpp |  3 +-
 Tests/Core/Layers/LayerTests.cpp              |  3 +-
 Tests/Core/Layers/NavigationLayerTests.cpp    |  3 +-
 Tests/Core/Layers/PlaneLayerTests.cpp         |  3 +-
 Tests/Core/Layers/ProtoLayerTests.cpp         |  3 +-
 Tests/Core/MagneticField/CMakeLists.txt       |  8 ++--
 .../MagneticField/ConstantBFieldTests.cpp     |  3 +-
 .../InterpolatedBFieldMapTests.cpp            |  3 +-
 ...MagneticFieldInterfaceConsistencyTests.cpp |  3 +-
 .../MagneticField/SolenoidBFieldTests.cpp     |  3 +-
 .../Material/BinnedSurfaceMaterialTests.cpp   |  3 +-
 Tests/Core/Material/CMakeLists.txt            | 12 ++---
 .../HomogeneousSurfaceMaterialTests.cpp       |  3 +-
 .../Material/MaterialCompositionTests.cpp     |  5 +-
 .../Core/Material/MaterialPropertiesTests.cpp |  3 +-
 Tests/Core/Material/MaterialTests.cpp         |  3 +-
 .../Material/SurfaceMaterialProxyTests.cpp    |  5 +-
 Tests/Core/Propagator/AbortListTests.cpp      |  3 +-
 Tests/Core/Propagator/ActionListTests.cpp     |  3 +-
 Tests/Core/Propagator/AuctioneerTests.cpp     |  3 +-
 Tests/Core/Propagator/CMakeLists.txt          | 18 ++++----
 .../Core/Propagator/ConstrainedStepTests.cpp  |  5 +-
 .../Propagator/IntersectionCorrectorTests.cpp |  3 +-
 Tests/Core/Propagator/JacobianTests.cpp       |  3 +-
 Tests/Core/Propagator/LoopProtectionTests.cpp |  3 +-
 Tests/Core/Propagator/PropagatorTests.cpp     |  3 +-
 Tests/Core/Propagator/StepperTests.cpp        |  3 +-
 Tests/Core/Seeding/CMakeLists.txt             |  4 +-
 Tests/Core/Seeding/SeedingTests.cpp           |  3 +-
 Tests/Core/Seeding/SeedingToolsTests.cpp      |  3 +-
 Tests/Core/Surfaces/BoundaryCheckTests.cpp    |  3 +-
 Tests/Core/Surfaces/CMakeLists.txt            | 46 +++++++++----------
 Tests/Core/Surfaces/ConeBoundsTests.cpp       |  3 +-
 Tests/Core/Surfaces/ConeSurfaceTests.cpp      |  3 +-
 Tests/Core/Surfaces/CylinderBoundsTests.cpp   |  3 +-
 Tests/Core/Surfaces/CylinderSurfaceTests.cpp  |  3 +-
 Tests/Core/Surfaces/DiamondBoundsTests.cpp    |  3 +-
 Tests/Core/Surfaces/DiscSurfaceTests.cpp      |  3 +-
 .../Surfaces/DiscTrapezoidalBoundsTests.cpp   |  3 +-
 Tests/Core/Surfaces/EllipseBoundsTests.cpp    |  3 +-
 Tests/Core/Surfaces/InfiniteBoundsTests.cpp   |  3 +-
 Tests/Core/Surfaces/LineBoundsTests.cpp       |  3 +-
 Tests/Core/Surfaces/LineSurfaceTests.cpp      |  3 +-
 Tests/Core/Surfaces/PerigeeSurfaceTests.cpp   |  3 +-
 Tests/Core/Surfaces/PlaneSurfaceTests.cpp     |  3 +-
 Tests/Core/Surfaces/RadialBoundsTests.cpp     |  3 +-
 Tests/Core/Surfaces/RectangleBoundsTests.cpp  |  3 +-
 Tests/Core/Surfaces/StrawSurfaceTests.cpp     |  3 +-
 Tests/Core/Surfaces/SurfaceArrayTests.cpp     |  6 ++-
 Tests/Core/Surfaces/SurfaceBoundsTests.cpp    |  3 +-
 Tests/Core/Surfaces/SurfaceTests.cpp          |  3 +-
 Tests/Core/Surfaces/TrapezoidBoundsTests.cpp  |  3 +-
 Tests/Core/Surfaces/TriangleBoundsTests.cpp   |  3 +-
 Tests/Core/Tools/CMakeLists.txt               | 10 ++--
 Tests/Core/Tools/CuboidVolumeBuilderTests.cpp |  3 +-
 .../Core/Tools/CylinderVolumeBuilderTests.cpp |  3 +-
 Tests/Core/Tools/LayerCreatorTests.cpp        |  3 +-
 Tests/Core/Tools/SimpleGeometryTests.cpp      |  3 +-
 Tests/Core/Tools/SurfaceArrayCreatorTests.cpp |  3 +-
 Tests/Core/Utilities/AxesTests.cpp            |  3 +-
 Tests/Core/Utilities/BFieldMapUtilsTests.cpp  |  3 +-
 Tests/Core/Utilities/BinUtilityTests.cpp      |  3 +-
 Tests/Core/Utilities/BinningDataTests.cpp     |  3 +-
 Tests/Core/Utilities/CMakeLists.txt           | 26 +++++------
 Tests/Core/Utilities/ExtendableTests.cpp      |  3 +-
 Tests/Core/Utilities/GeometryIDTests.cpp      |  3 +-
 Tests/Core/Utilities/GridTests.cpp            |  3 +-
 Tests/Core/Utilities/InterpolationTests.cpp   |  3 +-
 Tests/Core/Utilities/IntersectionTests.cpp    |  5 +-
 Tests/Core/Utilities/LoggerTests.cpp          |  3 +-
 Tests/Core/Utilities/MPLTests.cpp             |  3 +-
 .../Utilities/RealQuadraticEquationTests.cpp  |  3 +-
 Tests/Core/Utilities/UnitConversionTests.cpp  |  3 +-
 Tests/Core/Vertexing/CMakeLists.txt           |  6 +--
 .../FullBilloirVertexFitterTests.cpp          |  3 +-
 .../Vertexing/LinearizedTrackFactoryTests.cpp |  3 +-
 Tests/Core/Volumes/CMakeLists.txt             |  2 +-
 .../Volumes/CylinderVolumeBoundsTests.cpp     |  3 +-
 .../Integration/ATLSeedingIntegrationTest.cpp |  3 +-
 Tests/Integration/CMakeLists.txt              |  6 +--
 .../InterpolatedSolenoidBFieldTest.cpp        |  3 +-
 Tests/Integration/PropagationTestBase.hpp     |  5 +-
 Tests/Integration/PropagationTests.cpp        |  3 +-
 .../PropagationTestsAtlasField.cpp            |  3 +-
 .../Extrapolation/ExtrapolationCellTests.cpp  |  3 +-
 Tests/Plugins/Digitization/CMakeLists.txt     |  6 +--
 .../Digitization/ClusterizationTests.cpp      |  3 +-
 .../DoubleHitSpacePointBuilderTests.cpp       |  3 +-
 .../SingleHitSpacePointBuilderTests.cpp       |  3 +-
 Tests/Plugins/Json/CMakeLists.txt             |  2 +-
 Tests/Plugins/Json/FromJsonTests.cpp          |  3 +-
 .../AccumulatedMaterialPropertiesTests.cpp    |  3 +-
 .../AccumulatedSurfaceMaterialTests.cpp       |  5 +-
 Tests/Plugins/MaterialMapping/CMakeLists.txt  |  6 +--
 .../SurfaceMaterialMapperTests.cpp            |  3 +-
 119 files changed, 313 insertions(+), 207 deletions(-)

diff --git a/Tests/Core/CommonHelpers/include/Acts/Tests/CommonHelpers/FloatComparisons.hpp b/Tests/Core/CommonHelpers/include/Acts/Tests/CommonHelpers/FloatComparisons.hpp
index a1a09e20b..686525ec8 100644
--- a/Tests/Core/CommonHelpers/include/Acts/Tests/CommonHelpers/FloatComparisons.hpp
+++ b/Tests/Core/CommonHelpers/include/Acts/Tests/CommonHelpers/FloatComparisons.hpp
@@ -11,7 +11,8 @@
 #include <algorithm>
 #include <limits>
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include "Acts/Utilities/Definitions.hpp"
 
@@ -301,4 +302,4 @@ namespace Test {
     return true;
   }
 }
-}
\ No newline at end of file
+}
diff --git a/Tests/Core/Detector/CMakeLists.txt b/Tests/Core/Detector/CMakeLists.txt
index c328da17f..b840ab225 100644
--- a/Tests/Core/Detector/CMakeLists.txt
+++ b/Tests/Core/Detector/CMakeLists.txt
@@ -1,14 +1,14 @@
 add_executable (TrackingGeometryGeoIDTests TrackingGeometryGeoIDTests.cpp)
-target_link_libraries (TrackingGeometryGeoIDTests PRIVATE ActsCore)
+target_link_libraries (TrackingGeometryGeoIDTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME TrackingGeometryGeoIDUnitTest COMMAND TrackingGeometryGeoIDTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST TrackingGeometryGeoIDUnitTest TARGETS TrackingGeometryGeoIDTests)
 
 add_executable (TrackingGeometryCloseGeometryTests TrackingGeometryClosureTests.cpp)
-target_link_libraries (TrackingGeometryCloseGeometryTests PRIVATE ActsCore)
+target_link_libraries (TrackingGeometryCloseGeometryTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME TrackingGeometryCloseGeometryUnitTest COMMAND TrackingGeometryCloseGeometryTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST TrackingGeometryCloseGeometryUnitTest TARGETS TrackingGeometryCloseGeometryTests)
 
 add_executable (TrackingGeometryCreationTests TrackingGeometryCreationTests.cpp)
-target_link_libraries (TrackingGeometryCreationTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (TrackingGeometryCreationTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME TrackingGeometryCreationUnitTest COMMAND TrackingGeometryCreationTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST TrackingGeometryCreationUnitTest TARGETS TrackingGeometryCreationTests)
diff --git a/Tests/Core/Detector/TrackingGeometryClosureTests.cpp b/Tests/Core/Detector/TrackingGeometryClosureTests.cpp
index 9576af415..2f0bce208 100644
--- a/Tests/Core/Detector/TrackingGeometryClosureTests.cpp
+++ b/Tests/Core/Detector/TrackingGeometryClosureTests.cpp
@@ -9,7 +9,8 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE GeometryID Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/Units.hpp"
 #include "TrackingVolumeCreation.hpp"
diff --git a/Tests/Core/Detector/TrackingGeometryCreationTests.cpp b/Tests/Core/Detector/TrackingGeometryCreationTests.cpp
index 78ce5ed3c..52259ad82 100644
--- a/Tests/Core/Detector/TrackingGeometryCreationTests.cpp
+++ b/Tests/Core/Detector/TrackingGeometryCreationTests.cpp
@@ -9,7 +9,8 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE TrackingGeometry Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include "Acts/Detector/TrackingGeometry.hpp"
 #include "Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp"
 #include "Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp"
@@ -32,4 +33,4 @@ namespace Test {
   }
 
 }  // namespace Acts
-}  // namespace Test
\ No newline at end of file
+}  // namespace Test
diff --git a/Tests/Core/Detector/TrackingGeometryGeoIDTests.cpp b/Tests/Core/Detector/TrackingGeometryGeoIDTests.cpp
index c9d39920c..cf02e29c6 100644
--- a/Tests/Core/Detector/TrackingGeometryGeoIDTests.cpp
+++ b/Tests/Core/Detector/TrackingGeometryGeoIDTests.cpp
@@ -9,7 +9,8 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE GeometryID Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include "Acts/Detector/TrackingGeometry.hpp"
 #include "Acts/Utilities/Units.hpp"
 #include "TrackingVolumeCreation.hpp"
diff --git a/Tests/Core/EventData/BoundParametersTests.cpp b/Tests/Core/EventData/BoundParametersTests.cpp
index d356f3796..4ce2d99ba 100644
--- a/Tests/Core/EventData/BoundParametersTests.cpp
+++ b/Tests/Core/EventData/BoundParametersTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE BoundParameters Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
 
diff --git a/Tests/Core/EventData/CMakeLists.txt b/Tests/Core/EventData/CMakeLists.txt
index 427c52585..2c45b3526 100644
--- a/Tests/Core/EventData/CMakeLists.txt
+++ b/Tests/Core/EventData/CMakeLists.txt
@@ -1,29 +1,29 @@
 add_executable (ParameterSetTests ParameterSetTests.cpp)
 target_include_directories (ParameterSetTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (ParameterSetTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (ParameterSetTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME ParameterSetUnitTest COMMAND ParameterSetTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST ParameterSetUnitTest TARGETS ParameterSetTests)
 
 add_executable (MeasurementTests MeasurementTests.cpp)
 target_include_directories (MeasurementTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (MeasurementTests PRIVATE ActsCore)
+target_link_libraries (MeasurementTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME MeasurementUnitTest COMMAND MeasurementTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST MeasurementUnitTest TARGETS MeasurementTests)
 
 add_executable (CurvilinearParametersTests CurvilinearParametersTests.cpp)
 target_include_directories (CurvilinearParametersTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (CurvilinearParametersTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (CurvilinearParametersTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME CurvilinearParametersUnitTests COMMAND CurvilinearParametersTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST CurvilinearParametersUnitTests TARGETS CurvilinearParametersTests)
 
 add_executable (BoundParametersTests BoundParametersTests.cpp)
 target_include_directories (BoundParametersTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (BoundParametersTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (BoundParametersTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME BoundParametersUnitTests COMMAND BoundParametersTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST BoundParametersUnitTests TARGETS BoundParametersTests)
 
 add_executable (TrackStateTests TrackStateTests.cpp)
 target_include_directories (TrackStateTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (TrackStateTests PRIVATE ActsCore)
+target_link_libraries (TrackStateTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME TrackStateUnitTests COMMAND TrackStateTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST TrackStateUnitTests TARGETS TrackStateTests)
diff --git a/Tests/Core/EventData/CurvilinearParametersTests.cpp b/Tests/Core/EventData/CurvilinearParametersTests.cpp
index 07cac5be1..370c1297d 100644
--- a/Tests/Core/EventData/CurvilinearParametersTests.cpp
+++ b/Tests/Core/EventData/CurvilinearParametersTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE CurvilinearParameters Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include "Acts/EventData/NeutralParameters.hpp"
diff --git a/Tests/Core/EventData/MeasurementTests.cpp b/Tests/Core/EventData/MeasurementTests.cpp
index d2fde2a78..b8c6e4c9a 100644
--- a/Tests/Core/EventData/MeasurementTests.cpp
+++ b/Tests/Core/EventData/MeasurementTests.cpp
@@ -7,7 +7,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #define BOOST_TEST_MODULE Measurement Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include <random>
 
diff --git a/Tests/Core/EventData/ParameterSetTests.cpp b/Tests/Core/EventData/ParameterSetTests.cpp
index 2374f8d9a..153d864f2 100644
--- a/Tests/Core/EventData/ParameterSetTests.cpp
+++ b/Tests/Core/EventData/ParameterSetTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE ParameterSet Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <cmath>
diff --git a/Tests/Core/EventData/ParametersTestHelper.hpp b/Tests/Core/EventData/ParametersTestHelper.hpp
index 9faf2a9a2..11cf37cd5 100644
--- a/Tests/Core/EventData/ParametersTestHelper.hpp
+++ b/Tests/Core/EventData/ParametersTestHelper.hpp
@@ -8,7 +8,8 @@
 
 #pragma once
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 #include "Acts/Utilities/Definitions.hpp"
diff --git a/Tests/Core/EventData/TrackStateTests.cpp b/Tests/Core/EventData/TrackStateTests.cpp
index a31b1c532..c7b106700 100644
--- a/Tests/Core/EventData/TrackStateTests.cpp
+++ b/Tests/Core/EventData/TrackStateTests.cpp
@@ -8,7 +8,8 @@
 
 #define BOOST_TEST_MODULE TrackState Tests
 #include <boost/optional/optional_io.hpp>
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include <random>
 #include "Acts/EventData/Measurement.hpp"
diff --git a/Tests/Core/Extrapolator/CMakeLists.txt b/Tests/Core/Extrapolator/CMakeLists.txt
index 154bb49a5..52a236a10 100644
--- a/Tests/Core/Extrapolator/CMakeLists.txt
+++ b/Tests/Core/Extrapolator/CMakeLists.txt
@@ -1,20 +1,20 @@
 add_executable (NavigatorTests NavigatorTests.cpp)
-target_link_libraries (NavigatorTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (NavigatorTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME NavigatorUnitTests COMMAND NavigatorTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST NavigatorUnitTests TARGETS NavigatorTests)
 
 add_executable (MaterialCollectionTests MaterialCollectionTests.cpp)
-target_link_libraries (MaterialCollectionTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (MaterialCollectionTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME MaterialCollectionUnitTests COMMAND MaterialCollectionTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST MaterialCollectionUnitTests TARGETS MaterialCollectionTests)
     
 add_executable (ExtrapolatorTests ExtrapolatorTests.cpp)
-target_link_libraries (ExtrapolatorTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (ExtrapolatorTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME ExtrapolatorUnitTests COMMAND ExtrapolatorTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST ExtrapolatorUnitTests TARGETS ExtrapolatorTests)
 
 add_executable (KalmanExtrapolatorTests KalmanExtrapolatorTests.cpp)
-target_link_libraries (KalmanExtrapolatorTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (KalmanExtrapolatorTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME KalmanExtrapolatorUnitTests COMMAND KalmanExtrapolatorTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST KalmanExtrapolatorUnitTests TARGETS KalmanExtrapolatorTests)
 
diff --git a/Tests/Core/Extrapolator/ExtrapolatorTests.cpp b/Tests/Core/Extrapolator/ExtrapolatorTests.cpp
index cd6396960..bb2cf3422 100644
--- a/Tests/Core/Extrapolator/ExtrapolatorTests.cpp
+++ b/Tests/Core/Extrapolator/ExtrapolatorTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Extrapolator Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Extrapolator/KalmanExtrapolatorTests.cpp b/Tests/Core/Extrapolator/KalmanExtrapolatorTests.cpp
index 8ce5542ce..18eea7548 100644
--- a/Tests/Core/Extrapolator/KalmanExtrapolatorTests.cpp
+++ b/Tests/Core/Extrapolator/KalmanExtrapolatorTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Kalman Extrapolator Test
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <cmath>
@@ -186,4 +187,4 @@ namespace Test {
     CHECK_CLOSE_OR_SMALL(pJacobian, accJacobian, 1e-6, 1e-9);
   }
 }
-}
\ No newline at end of file
+}
diff --git a/Tests/Core/Extrapolator/MaterialCollectionTests.cpp b/Tests/Core/Extrapolator/MaterialCollectionTests.cpp
index dc6a2b715..c01da2305 100644
--- a/Tests/Core/Extrapolator/MaterialCollectionTests.cpp
+++ b/Tests/Core/Extrapolator/MaterialCollectionTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE MaterialCollection Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Extrapolator/NavigatorTests.cpp b/Tests/Core/Extrapolator/NavigatorTests.cpp
index c53b3298c..fd5ff79be 100644
--- a/Tests/Core/Extrapolator/NavigatorTests.cpp
+++ b/Tests/Core/Extrapolator/NavigatorTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Navigator Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Fitter/CMakeLists.txt b/Tests/Core/Fitter/CMakeLists.txt
index 31df73253..0255c8770 100644
--- a/Tests/Core/Fitter/CMakeLists.txt
+++ b/Tests/Core/Fitter/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_executable (KalmanFitterTests KalmanFitterTests.cpp)
 target_include_directories (KalmanFitterTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (KalmanFitterTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (KalmanFitterTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME KalmanFitterUnitTests COMMAND KalmanFitterTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST KalmanFitterUnitTests TARGETS KalmanFitterTests)
 
 add_executable (GainMatrixTests GainMatrixTests.cpp)
 target_include_directories (GainMatrixTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (GainMatrixTests PRIVATE ActsCore)
+target_link_libraries (GainMatrixTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME GainMatrixUnitTest COMMAND GainMatrixTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST GainMatrixUnitTest TARGETS GainMatrixTests)
diff --git a/Tests/Core/Fitter/GainMatrixTests.cpp b/Tests/Core/Fitter/GainMatrixTests.cpp
index e3055dd0e..d3727860d 100644
--- a/Tests/Core/Fitter/GainMatrixTests.cpp
+++ b/Tests/Core/Fitter/GainMatrixTests.cpp
@@ -10,7 +10,8 @@
 
 #define BOOST_TEST_MODULE GainMatrix Tests
 #include <boost/optional/optional_io.hpp>
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include "Acts/EventData/Measurement.hpp"
 #include "Acts/EventData/MeasurementHelpers.hpp"
diff --git a/Tests/Core/Fitter/KalmanFitterTests.cpp b/Tests/Core/Fitter/KalmanFitterTests.cpp
index c58e330ba..26c384f23 100644
--- a/Tests/Core/Fitter/KalmanFitterTests.cpp
+++ b/Tests/Core/Fitter/KalmanFitterTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE KalmanFitter Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <algorithm>
diff --git a/Tests/Core/Layers/CMakeLists.txt b/Tests/Core/Layers/CMakeLists.txt
index d2416fce8..69988077d 100644
--- a/Tests/Core/Layers/CMakeLists.txt
+++ b/Tests/Core/Layers/CMakeLists.txt
@@ -1,32 +1,32 @@
 add_executable (GenericApproachDescriptorTests GenericApproachDescriptorTests.cpp)
-target_link_libraries (GenericApproachDescriptorTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (GenericApproachDescriptorTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME GenericApproachDescriptorUnitTests COMMAND GenericApproachDescriptorTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST GenericApproachDescriptorUnitTests TARGETS GenericApproachDescriptorTests)
 
 add_executable (LayerTests LayerTests.cpp)
-target_link_libraries (LayerTests PRIVATE ActsCore)
+target_link_libraries (LayerTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME LayerUnitTest COMMAND LayerTests)
 
 add_executable (PlaneLayerTests PlaneLayerTests.cpp)
-target_link_libraries (PlaneLayerTests PRIVATE ActsCore)
+target_link_libraries (PlaneLayerTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME PlaneLayerUnitTest COMMAND PlaneLayerTests)
 
 add_executable (DiscLayerTests DiscLayerTests.cpp)
-target_link_libraries (DiscLayerTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (DiscLayerTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME DiscLayerUnitTest COMMAND DiscLayerTests)
 
 add_executable (CylinderLayerTests CylinderLayerTests.cpp)
-target_link_libraries (CylinderLayerTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (CylinderLayerTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME CylinderLayerUnitTest COMMAND CylinderLayerTests)
 
 add_executable (ConeLayerTests ConeLayerTests.cpp)
-target_link_libraries (ConeLayerTests PRIVATE ActsCore)
+target_link_libraries (ConeLayerTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME ConeLayerUnitTest COMMAND ConeLayerTests)
 
 add_executable (NavigationLayerTests NavigationLayerTests.cpp)
-target_link_libraries (NavigationLayerTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (NavigationLayerTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME NavigationLayerUnitTest COMMAND NavigationLayerTests)
 
 add_executable (ProtoLayerTests ProtoLayerTests.cpp)
-target_link_libraries (ProtoLayerTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (ProtoLayerTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME ProtoLayerUnitTest COMMAND ProtoLayerTests)
diff --git a/Tests/Core/Layers/ConeLayerTests.cpp b/Tests/Core/Layers/ConeLayerTests.cpp
index 3b4feaa43..1a2944872 100644
--- a/Tests/Core/Layers/ConeLayerTests.cpp
+++ b/Tests/Core/Layers/ConeLayerTests.cpp
@@ -8,7 +8,8 @@
 
 #define BOOST_TEST_MODULE Layer Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <boost/test/data/test_case.hpp>
diff --git a/Tests/Core/Layers/CylinderLayerTests.cpp b/Tests/Core/Layers/CylinderLayerTests.cpp
index 542593807..d6fdebde8 100644
--- a/Tests/Core/Layers/CylinderLayerTests.cpp
+++ b/Tests/Core/Layers/CylinderLayerTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Layer Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Layers/DiscLayerTests.cpp b/Tests/Core/Layers/DiscLayerTests.cpp
index 381f1d67e..31f060ebe 100644
--- a/Tests/Core/Layers/DiscLayerTests.cpp
+++ b/Tests/Core/Layers/DiscLayerTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Layer Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Layers/GenericApproachDescriptorTests.cpp b/Tests/Core/Layers/GenericApproachDescriptorTests.cpp
index ad10ead2f..9a9a8ae2e 100644
--- a/Tests/Core/Layers/GenericApproachDescriptorTests.cpp
+++ b/Tests/Core/Layers/GenericApproachDescriptorTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Layer Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Layers/LayerTests.cpp b/Tests/Core/Layers/LayerTests.cpp
index f056bcbb7..4b9b59bfe 100644
--- a/Tests/Core/Layers/LayerTests.cpp
+++ b/Tests/Core/Layers/LayerTests.cpp
@@ -8,7 +8,8 @@
 
 #define BOOST_TEST_MODULE Layer Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <boost/test/data/test_case.hpp>
diff --git a/Tests/Core/Layers/NavigationLayerTests.cpp b/Tests/Core/Layers/NavigationLayerTests.cpp
index 07b06025e..f49b08073 100644
--- a/Tests/Core/Layers/NavigationLayerTests.cpp
+++ b/Tests/Core/Layers/NavigationLayerTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Layer Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Layers/PlaneLayerTests.cpp b/Tests/Core/Layers/PlaneLayerTests.cpp
index 1c2cc0acd..48fc49ff7 100644
--- a/Tests/Core/Layers/PlaneLayerTests.cpp
+++ b/Tests/Core/Layers/PlaneLayerTests.cpp
@@ -8,7 +8,8 @@
 
 #define BOOST_TEST_MODULE Layer Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <boost/test/data/test_case.hpp>
diff --git a/Tests/Core/Layers/ProtoLayerTests.cpp b/Tests/Core/Layers/ProtoLayerTests.cpp
index bafc3570e..d0ae448c0 100644
--- a/Tests/Core/Layers/ProtoLayerTests.cpp
+++ b/Tests/Core/Layers/ProtoLayerTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE ProtoLayerTests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
 
diff --git a/Tests/Core/MagneticField/CMakeLists.txt b/Tests/Core/MagneticField/CMakeLists.txt
index f9ff71663..204b86432 100644
--- a/Tests/Core/MagneticField/CMakeLists.txt
+++ b/Tests/Core/MagneticField/CMakeLists.txt
@@ -1,18 +1,18 @@
 add_executable (ConstantBFieldTests ConstantBFieldTests.cpp)
 target_include_directories (ConstantBFieldTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (ConstantBFieldTests PRIVATE ActsCore)
+target_link_libraries (ConstantBFieldTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME ConstantBFieldUnitTest COMMAND ConstantBFieldTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST ConstantBFieldUnitTest TARGETS ConstantBFieldTests)
 
 add_executable (InterpolatedBFieldMapTests InterpolatedBFieldMapTests.cpp)
 target_include_directories (InterpolatedBFieldMapTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (InterpolatedBFieldMapTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (InterpolatedBFieldMapTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME InterpolatedBFieldMapUnitTest COMMAND InterpolatedBFieldMapTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST InterpolatedBFieldMapUnitTest TARGETS InterpolatedBFieldMapTests)
 
 add_executable (SolenoidBFieldTests SolenoidBFieldTests.cpp)
 target_include_directories (SolenoidBFieldTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (SolenoidBFieldTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (SolenoidBFieldTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME SolenoidBFieldUnitTest COMMAND SolenoidBFieldTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST SolenoidBFieldUnitTest TARGETS SolenoidBFieldTests)
 
@@ -22,5 +22,5 @@ target_link_libraries (SolenoidFieldBenchmark PRIVATE ActsCore)
 
 add_executable (MagneticFieldInterfaceConsistencyTests MagneticFieldInterfaceConsistencyTests.cpp)
 target_include_directories (MagneticFieldInterfaceConsistencyTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (MagneticFieldInterfaceConsistencyTests PRIVATE ActsCore)
+target_link_libraries (MagneticFieldInterfaceConsistencyTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME MagneticFieldInterfaceConsistencyTests COMMAND MagneticFieldInterfaceConsistencyTests)
diff --git a/Tests/Core/MagneticField/ConstantBFieldTests.cpp b/Tests/Core/MagneticField/ConstantBFieldTests.cpp
index e788d56e3..71f7dfd02 100644
--- a/Tests/Core/MagneticField/ConstantBFieldTests.cpp
+++ b/Tests/Core/MagneticField/ConstantBFieldTests.cpp
@@ -10,7 +10,8 @@
 #define BOOST_TEST_MODULE Constant magnetic field tests
 
 // clang-format off
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include "Acts/MagneticField/ConstantBField.hpp"
 #include "Acts/Utilities/Definitions.hpp"
diff --git a/Tests/Core/MagneticField/InterpolatedBFieldMapTests.cpp b/Tests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
index 337a36b83..1ef41ce64 100644
--- a/Tests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
+++ b/Tests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
@@ -10,7 +10,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Mapped magnetic field tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include "Acts/MagneticField/InterpolatedBFieldMap.hpp"
diff --git a/Tests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp b/Tests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp
index 1363a89bf..9ea1c83a4 100644
--- a/Tests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp
+++ b/Tests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp
@@ -10,7 +10,8 @@
 #define BOOST_TEST_MODULE Magnetic field interface consistency tests
 
 // clang-format off
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/floating_point_comparison.hpp>
 #include "Acts/Utilities/Definitions.hpp"
diff --git a/Tests/Core/MagneticField/SolenoidBFieldTests.cpp b/Tests/Core/MagneticField/SolenoidBFieldTests.cpp
index 4fb421e57..01f4c219f 100644
--- a/Tests/Core/MagneticField/SolenoidBFieldTests.cpp
+++ b/Tests/Core/MagneticField/SolenoidBFieldTests.cpp
@@ -10,7 +10,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Solenoid magnetic field tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
 
diff --git a/Tests/Core/Material/BinnedSurfaceMaterialTests.cpp b/Tests/Core/Material/BinnedSurfaceMaterialTests.cpp
index 6d32b4407..f0cf8e205 100644
--- a/Tests/Core/Material/BinnedSurfaceMaterialTests.cpp
+++ b/Tests/Core/Material/BinnedSurfaceMaterialTests.cpp
@@ -8,7 +8,8 @@
 
 ///  Boost include(s)
 #define BOOST_TEST_MODULE SurfaceMaterial Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <climits>
 #include "Acts/Material/BinnedSurfaceMaterial.hpp"
 #include "Acts/Material/Material.hpp"
diff --git a/Tests/Core/Material/CMakeLists.txt b/Tests/Core/Material/CMakeLists.txt
index 7eeae30e0..29ea23552 100644
--- a/Tests/Core/Material/CMakeLists.txt
+++ b/Tests/Core/Material/CMakeLists.txt
@@ -1,26 +1,26 @@
 add_executable (MaterialCompositionTests MaterialCompositionTests.cpp)
 target_include_directories (MaterialCompositionTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (MaterialCompositionTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (MaterialCompositionTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
 add_executable (MaterialTests MaterialTests.cpp)
 target_include_directories (MaterialTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (MaterialTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (MaterialTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
 add_executable (MaterialPropertiesTests MaterialPropertiesTests.cpp)
 target_include_directories (MaterialPropertiesTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (MaterialPropertiesTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (MaterialPropertiesTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
 add_executable (HomogeneousSurfaceMaterialTests HomogeneousSurfaceMaterialTests.cpp)
 target_include_directories (HomogeneousSurfaceMaterialTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (HomogeneousSurfaceMaterialTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (HomogeneousSurfaceMaterialTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
 add_executable (BinnedSurfaceMaterialTests BinnedSurfaceMaterialTests.cpp)
 target_include_directories (BinnedSurfaceMaterialTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (BinnedSurfaceMaterialTests PRIVATE ActsCore)
+target_link_libraries (BinnedSurfaceMaterialTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
 add_executable (SurfaceMaterialProxyTests SurfaceMaterialProxyTests.cpp)
 target_include_directories (SurfaceMaterialProxyTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (SurfaceMaterialProxyTests PRIVATE ActsCore)
+target_link_libraries (SurfaceMaterialProxyTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
 add_test (NAME MaterialUnitTest COMMAND MaterialCompositionTests MaterialTests MaterialPropertiesTests HomogeneousSurfaceMaterialTests BinnedSurfaceMaterialTests SurfaceMaterialProxyTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST MaterialUnitTest TARGETS MaterialCompositionTests MaterialTests MaterialPropertiesTests HomogeneousSurfaceMaterialTests BinnedSurfaceMaterialTests SurfaceMaterialProxyTests)
diff --git a/Tests/Core/Material/HomogeneousSurfaceMaterialTests.cpp b/Tests/Core/Material/HomogeneousSurfaceMaterialTests.cpp
index 02a01633a..63ef340f7 100644
--- a/Tests/Core/Material/HomogeneousSurfaceMaterialTests.cpp
+++ b/Tests/Core/Material/HomogeneousSurfaceMaterialTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE HomogeneousSurfaceMaterial Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <climits>
diff --git a/Tests/Core/Material/MaterialCompositionTests.cpp b/Tests/Core/Material/MaterialCompositionTests.cpp
index ec82ec418..86eb593bf 100644
--- a/Tests/Core/Material/MaterialCompositionTests.cpp
+++ b/Tests/Core/Material/MaterialCompositionTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Material Composition Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <climits>
@@ -160,4 +161,4 @@ namespace Test {
     BOOST_CHECK_EQUAL(mCompositionMovedAssigned.size(), elements.size());
   }
 }
-}
\ No newline at end of file
+}
diff --git a/Tests/Core/Material/MaterialPropertiesTests.cpp b/Tests/Core/Material/MaterialPropertiesTests.cpp
index c351fe9fd..5bd94cbd0 100644
--- a/Tests/Core/Material/MaterialPropertiesTests.cpp
+++ b/Tests/Core/Material/MaterialPropertiesTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE MaterialProperties Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <climits>
diff --git a/Tests/Core/Material/MaterialTests.cpp b/Tests/Core/Material/MaterialTests.cpp
index 4bbe7ad2b..16f32506e 100644
--- a/Tests/Core/Material/MaterialTests.cpp
+++ b/Tests/Core/Material/MaterialTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Material Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <climits>
diff --git a/Tests/Core/Material/SurfaceMaterialProxyTests.cpp b/Tests/Core/Material/SurfaceMaterialProxyTests.cpp
index b6061017b..f794bf3fb 100644
--- a/Tests/Core/Material/SurfaceMaterialProxyTests.cpp
+++ b/Tests/Core/Material/SurfaceMaterialProxyTests.cpp
@@ -8,7 +8,8 @@
 
 ///  Boost include(s)
 #define BOOST_TEST_MODULE SurfaceMaterialProxy Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <climits>
 #include "Acts/Material/SurfaceMaterialProxy.hpp"
 
@@ -31,4 +32,4 @@ namespace Test {
   }
 
 }  // namespace Test
-}  // namespace Acts
\ No newline at end of file
+}  // namespace Acts
diff --git a/Tests/Core/Propagator/AbortListTests.cpp b/Tests/Core/Propagator/AbortListTests.cpp
index f01d00f4d..02aba9421 100644
--- a/Tests/Core/Propagator/AbortListTests.cpp
+++ b/Tests/Core/Propagator/AbortListTests.cpp
@@ -9,7 +9,8 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE AbortList Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <boost/test/data/test_case.hpp>
diff --git a/Tests/Core/Propagator/ActionListTests.cpp b/Tests/Core/Propagator/ActionListTests.cpp
index 94914af68..f5e06d73b 100644
--- a/Tests/Core/Propagator/ActionListTests.cpp
+++ b/Tests/Core/Propagator/ActionListTests.cpp
@@ -9,7 +9,8 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE ActionList Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <boost/test/data/test_case.hpp>
diff --git a/Tests/Core/Propagator/AuctioneerTests.cpp b/Tests/Core/Propagator/AuctioneerTests.cpp
index 44b524f38..dac408543 100644
--- a/Tests/Core/Propagator/AuctioneerTests.cpp
+++ b/Tests/Core/Propagator/AuctioneerTests.cpp
@@ -9,7 +9,8 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE Auctioneer Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <vector>
diff --git a/Tests/Core/Propagator/CMakeLists.txt b/Tests/Core/Propagator/CMakeLists.txt
index c3aebaf7e..a047a4ba5 100644
--- a/Tests/Core/Propagator/CMakeLists.txt
+++ b/Tests/Core/Propagator/CMakeLists.txt
@@ -1,21 +1,21 @@
 add_executable (AbortListTests AbortListTests.cpp)
-target_link_libraries (AbortListTests PRIVATE ActsCore)
+target_link_libraries (AbortListTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME AbortListUnitTest COMMAND AbortListTests)
 
 add_executable (ActionListTests ActionListTests.cpp)
-target_link_libraries (ActionListTests PRIVATE ActsCore)
+target_link_libraries (ActionListTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME ActionListUnitTests COMMAND ActionListTests)
 
 add_executable (IntersectionCorrectorTests IntersectionCorrectorTests.cpp)
-target_link_libraries (IntersectionCorrectorTests PRIVATE ActsCore)
+target_link_libraries (IntersectionCorrectorTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME IntersectionCorrectorUnitTests COMMAND IntersectionCorrectorTests)
 
 add_executable (LoopProtectionTests LoopProtectionTests.cpp)
-target_link_libraries (LoopProtectionTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (LoopProtectionTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME LoopProtectionUnitTests COMMAND LoopProtectionTests)
 
 add_executable (ConstrainedStepTests ConstrainedStepTests.cpp)
-target_link_libraries (ConstrainedStepTests PRIVATE ActsCore)
+target_link_libraries (ConstrainedStepTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME ConstrainedStepUnitTest COMMAND ConstrainedStepTests)
 
 add_executable (EigenStepperBenchmark EigenStepperBenchmark.cpp)
@@ -26,21 +26,21 @@ target_link_libraries (EigenStepperBenchmark PRIVATE ${Boost_LIBRARIES})
 install (TARGETS EigenStepperBenchmark RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/Profiling)
 
 add_executable (AuctioneerTests AuctioneerTests.cpp)
-target_link_libraries (AuctioneerTests PRIVATE ActsCore)
+target_link_libraries (AuctioneerTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME AuctioneerUnitTest COMMAND AuctioneerTests)
 
 add_executable (StepperTests StepperTests.cpp)
-target_link_libraries (StepperTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (StepperTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME StepperUnitTest COMMAND StepperTests)
 
 # these tests rely on the Legacy code
 if (ACTS_BUILD_LEGACY)
   add_executable (JacobianTests JacobianTests.cpp)
-  target_link_libraries (JacobianTests PRIVATE ActsCore ActsLegacy ActsTestsCommonHelpers)
+  target_link_libraries (JacobianTests PRIVATE ActsCore ActsLegacy ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
   add_test(NAME JacobianUnitTests COMMAND JacobianTests)
   
   add_executable (PropagatorTests PropagatorTests.cpp)
-  target_link_libraries (PropagatorTests PRIVATE ActsCore ActsLegacy ActsTestsCommonHelpers)
+  target_link_libraries (PropagatorTests PRIVATE ActsCore ActsLegacy ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
   add_test(NAME PropagatorUnitTests COMMAND PropagatorTests)
   
   # define executables
diff --git a/Tests/Core/Propagator/ConstrainedStepTests.cpp b/Tests/Core/Propagator/ConstrainedStepTests.cpp
index 179b69197..633698187 100644
--- a/Tests/Core/Propagator/ConstrainedStepTests.cpp
+++ b/Tests/Core/Propagator/ConstrainedStepTests.cpp
@@ -9,7 +9,8 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE ConstraintStep Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <boost/test/data/test_case.hpp>
@@ -109,4 +110,4 @@ namespace Test {
   }
 
 }  // namespace Test
-}  // namespace Acts
\ No newline at end of file
+}  // namespace Acts
diff --git a/Tests/Core/Propagator/IntersectionCorrectorTests.cpp b/Tests/Core/Propagator/IntersectionCorrectorTests.cpp
index 73f49590b..284e5a665 100644
--- a/Tests/Core/Propagator/IntersectionCorrectorTests.cpp
+++ b/Tests/Core/Propagator/IntersectionCorrectorTests.cpp
@@ -9,7 +9,8 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE RelativePathCorrector Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <boost/test/data/test_case.hpp>
diff --git a/Tests/Core/Propagator/JacobianTests.cpp b/Tests/Core/Propagator/JacobianTests.cpp
index b0a52085f..f35047423 100644
--- a/Tests/Core/Propagator/JacobianTests.cpp
+++ b/Tests/Core/Propagator/JacobianTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE JacobianTests Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Propagator/LoopProtectionTests.cpp b/Tests/Core/Propagator/LoopProtectionTests.cpp
index 928695ec5..0fdfb234a 100644
--- a/Tests/Core/Propagator/LoopProtectionTests.cpp
+++ b/Tests/Core/Propagator/LoopProtectionTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE LoopAborter Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Propagator/PropagatorTests.cpp b/Tests/Core/Propagator/PropagatorTests.cpp
index 35f63b8f5..a61539d9a 100644
--- a/Tests/Core/Propagator/PropagatorTests.cpp
+++ b/Tests/Core/Propagator/PropagatorTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Propagator Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Propagator/StepperTests.cpp b/Tests/Core/Propagator/StepperTests.cpp
index 5ebde6725..74c5eb0b2 100644
--- a/Tests/Core/Propagator/StepperTests.cpp
+++ b/Tests/Core/Propagator/StepperTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Stepper Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <fstream>
diff --git a/Tests/Core/Seeding/CMakeLists.txt b/Tests/Core/Seeding/CMakeLists.txt
index 6ae1d1aa1..78dc3d5c4 100644
--- a/Tests/Core/Seeding/CMakeLists.txt
+++ b/Tests/Core/Seeding/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_executable (SeedingTests SeedingTests.cpp)
 target_include_directories (SeedingTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (SeedingTests PRIVATE ActsCore)
+target_link_libraries (SeedingTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME SeedingUnitTest COMMAND SeedingTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST SeedingUnitTest TARGETS SeedingTests)
 
 add_executable (SeedingToolsTests SeedingToolsTests.cpp)
 target_include_directories (SeedingToolsTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (SeedingToolsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (SeedingToolsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME SeedingToolsUnitTest COMMAND SeedingToolsTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST SeedingToolsUnitTest TARGETS SeedingToolsTests)
diff --git a/Tests/Core/Seeding/SeedingTests.cpp b/Tests/Core/Seeding/SeedingTests.cpp
index bd7bde8cc..aebaa6efc 100644
--- a/Tests/Core/Seeding/SeedingTests.cpp
+++ b/Tests/Core/Seeding/SeedingTests.cpp
@@ -9,7 +9,8 @@
 #include <iostream>
 
 #define BOOST_TEST_MODULE Seeding Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include "Acts/Seeding/BarrelSeedFinder.hpp"
 #include "Acts/Seeding/SpacePoint.hpp"
diff --git a/Tests/Core/Seeding/SeedingToolsTests.cpp b/Tests/Core/Seeding/SeedingToolsTests.cpp
index b3d25241a..8acb7eb6e 100644
--- a/Tests/Core/Seeding/SeedingToolsTests.cpp
+++ b/Tests/Core/Seeding/SeedingToolsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Seeding Tools Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
 
diff --git a/Tests/Core/Surfaces/BoundaryCheckTests.cpp b/Tests/Core/Surfaces/BoundaryCheckTests.cpp
index 2219ead18..138606fa1 100644
--- a/Tests/Core/Surfaces/BoundaryCheckTests.cpp
+++ b/Tests/Core/Surfaces/BoundaryCheckTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE BoundaryCheck Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/CMakeLists.txt b/Tests/Core/Surfaces/CMakeLists.txt
index d04c786f1..2d0a4607e 100644
--- a/Tests/Core/Surfaces/CMakeLists.txt
+++ b/Tests/Core/Surfaces/CMakeLists.txt
@@ -1,92 +1,92 @@
 add_executable (BoundaryCheckTests BoundaryCheckTests.cpp)
-target_link_libraries (BoundaryCheckTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (BoundaryCheckTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME BoundaryCheckUnitTest COMMAND BoundaryCheckTests)
 
 add_executable (BoundaryCheckBenchmark BoundaryCheckBenchmark.cpp)
-target_link_libraries (BoundaryCheckBenchmark PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (BoundaryCheckBenchmark PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 install (TARGETS BoundaryCheckBenchmark
 	     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/Profiling)
 
 add_executable (SurfaceTests SurfaceTests.cpp)
-target_link_libraries (SurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (SurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME SurfaceUnitTest COMMAND SurfaceTests)
 
 add_executable (LineSurfaceTests LineSurfaceTests.cpp)
-target_link_libraries (LineSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (LineSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME LineSurfaceUnitTest COMMAND LineSurfaceTests)
 
 add_executable (PerigeeSurfaceTests PerigeeSurfaceTests.cpp)
-target_link_libraries (PerigeeSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (PerigeeSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME PerigeeSurfaceUnitTest COMMAND PerigeeSurfaceTests)
 
 add_executable (StrawSurfaceTests StrawSurfaceTests.cpp)
-target_link_libraries (StrawSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (StrawSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME StrawSurfaceUnitTest COMMAND StrawSurfaceTests)
 
 add_executable (CylinderSurfaceTests CylinderSurfaceTests.cpp)
-target_link_libraries (CylinderSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (CylinderSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME CylinderSurfaceUnitTest COMMAND CylinderSurfaceTests)
 
 add_executable (ConeSurfaceTests ConeSurfaceTests.cpp)
-target_link_libraries (ConeSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (ConeSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME ConeSurfaceUnitTest COMMAND ConeSurfaceTests)
 
 add_executable (DiscSurfaceTests DiscSurfaceTests.cpp)
-target_link_libraries (DiscSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (DiscSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME DiscSurfaceUnitTest COMMAND DiscSurfaceTests)
 
 add_executable (PlaneSurfaceTests PlaneSurfaceTests.cpp)
-target_link_libraries (PlaneSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (PlaneSurfaceTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME PlaneSurfaceUnitTest COMMAND PlaneSurfaceTests)
 
 add_executable (SurfaceBoundsTests SurfaceBoundsTests.cpp)
-target_link_libraries (SurfaceBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (SurfaceBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME SurfaceBoundsUnitTest COMMAND SurfaceBoundsTests)
 
 add_executable (InfiniteBoundsTests InfiniteBoundsTests.cpp)
-target_link_libraries (InfiniteBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (InfiniteBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME InfiniteBoundsUnitTest COMMAND InfiniteBoundsTests)
 
 add_executable (LineBoundsTests LineBoundsTests.cpp)
-target_link_libraries (LineBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (LineBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME LineBoundsUnitTest COMMAND LineBoundsTests)
 
 add_executable (CylinderBoundsTests CylinderBoundsTests.cpp)
-target_link_libraries (CylinderBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (CylinderBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME CylinderBoundsUnitTest COMMAND CylinderBoundsTests)
 
 add_executable (ConeBoundsTests ConeBoundsTests.cpp)
-target_link_libraries (ConeBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (ConeBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME ConeBoundsUnitTest COMMAND ConeBoundsTests)
 
 add_executable (DiamondBoundsTests DiamondBoundsTests.cpp)
-target_link_libraries (DiamondBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (DiamondBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME DiamondBoundsUnitTest COMMAND DiamondBoundsTests)
 
 add_executable (EllipseBoundsTests EllipseBoundsTests.cpp)
-target_link_libraries (EllipseBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (EllipseBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME EllipseBoundsTests COMMAND EllipseBoundsTests)
 
 add_executable (TriangleBoundsTests TriangleBoundsTests.cpp)
-target_link_libraries (TriangleBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (TriangleBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME TriangleBoundsTests COMMAND TriangleBoundsTests)
 
 add_executable (RectangleBoundsTests RectangleBoundsTests.cpp)
-target_link_libraries (RectangleBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (RectangleBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME RectangleBoundsTests COMMAND RectangleBoundsTests)
 
 add_executable (TrapezoidBoundsTests TrapezoidBoundsTests.cpp)
-target_link_libraries (TrapezoidBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (TrapezoidBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME TrapezoidBoundsTests COMMAND TrapezoidBoundsTests)
 
 add_executable (RadialBoundsTests RadialBoundsTests.cpp)
-target_link_libraries (RadialBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (RadialBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME RadialBoundsUnitTest COMMAND RadialBoundsTests)
 
 add_executable (DiscTrapezoidalBoundsTests DiscTrapezoidalBoundsTests.cpp)
-target_link_libraries (DiscTrapezoidalBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (DiscTrapezoidalBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME DiscTrapezoidalBoundsUnitTest COMMAND DiscTrapezoidalBoundsTests)
 
 add_executable (SurfaceArrayTests SurfaceArrayTests.cpp)
-target_link_libraries (SurfaceArrayTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (SurfaceArrayTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME SurfaceArrayUnitTest COMMAND SurfaceArrayTests)
diff --git a/Tests/Core/Surfaces/ConeBoundsTests.cpp b/Tests/Core/Surfaces/ConeBoundsTests.cpp
index 4854e5fed..7cab3469c 100644
--- a/Tests/Core/Surfaces/ConeBoundsTests.cpp
+++ b/Tests/Core/Surfaces/ConeBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Cone Bounds Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/ConeSurfaceTests.cpp b/Tests/Core/Surfaces/ConeSurfaceTests.cpp
index c917f9503..d7cfdc8a0 100644
--- a/Tests/Core/Surfaces/ConeSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/ConeSurfaceTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE ConeSurface Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/CylinderBoundsTests.cpp b/Tests/Core/Surfaces/CylinderBoundsTests.cpp
index dc3361a73..609ce53c7 100644
--- a/Tests/Core/Surfaces/CylinderBoundsTests.cpp
+++ b/Tests/Core/Surfaces/CylinderBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Cylinder Bounds Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/CylinderSurfaceTests.cpp b/Tests/Core/Surfaces/CylinderSurfaceTests.cpp
index ee4ca156b..79b6bd8e5 100644
--- a/Tests/Core/Surfaces/CylinderSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/CylinderSurfaceTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE CylinderSurface Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/DiamondBoundsTests.cpp b/Tests/Core/Surfaces/DiamondBoundsTests.cpp
index 0d30611be..9837276f6 100644
--- a/Tests/Core/Surfaces/DiamondBoundsTests.cpp
+++ b/Tests/Core/Surfaces/DiamondBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Diamond Bounds Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/DiscSurfaceTests.cpp b/Tests/Core/Surfaces/DiscSurfaceTests.cpp
index ad5ee594e..6435b91b1 100644
--- a/Tests/Core/Surfaces/DiscSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/DiscSurfaceTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Disc Surface Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/DiscTrapezoidalBoundsTests.cpp b/Tests/Core/Surfaces/DiscTrapezoidalBoundsTests.cpp
index 8413e47ed..a1c75bcc3 100644
--- a/Tests/Core/Surfaces/DiscTrapezoidalBoundsTests.cpp
+++ b/Tests/Core/Surfaces/DiscTrapezoidalBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE DiscTrapezoidal Bounds Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/EllipseBoundsTests.cpp b/Tests/Core/Surfaces/EllipseBoundsTests.cpp
index 6bba9f6ed..bcb4905ec 100644
--- a/Tests/Core/Surfaces/EllipseBoundsTests.cpp
+++ b/Tests/Core/Surfaces/EllipseBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Ellipse Bounds Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/InfiniteBoundsTests.cpp b/Tests/Core/Surfaces/InfiniteBoundsTests.cpp
index 0e2ced45e..080e49c39 100644
--- a/Tests/Core/Surfaces/InfiniteBoundsTests.cpp
+++ b/Tests/Core/Surfaces/InfiniteBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 #define BOOST_TEST_MODULE Infinite Bounds Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <boost/test/data/test_case.hpp>
diff --git a/Tests/Core/Surfaces/LineBoundsTests.cpp b/Tests/Core/Surfaces/LineBoundsTests.cpp
index 6ea43f989..f6b12f2d6 100644
--- a/Tests/Core/Surfaces/LineBoundsTests.cpp
+++ b/Tests/Core/Surfaces/LineBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Line Bounds Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/LineSurfaceTests.cpp b/Tests/Core/Surfaces/LineSurfaceTests.cpp
index 2495bc0f6..a164dd0ec 100644
--- a/Tests/Core/Surfaces/LineSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/LineSurfaceTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Line Surface Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/PerigeeSurfaceTests.cpp b/Tests/Core/Surfaces/PerigeeSurfaceTests.cpp
index f75c7a2cc..fe4ac6d3a 100644
--- a/Tests/Core/Surfaces/PerigeeSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/PerigeeSurfaceTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE PerigeeSurface Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/PlaneSurfaceTests.cpp b/Tests/Core/Surfaces/PlaneSurfaceTests.cpp
index 324b484e2..584918ba9 100644
--- a/Tests/Core/Surfaces/PlaneSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/PlaneSurfaceTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE PlaneSurface Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/RadialBoundsTests.cpp b/Tests/Core/Surfaces/RadialBoundsTests.cpp
index 754225f4d..0ce9980e6 100644
--- a/Tests/Core/Surfaces/RadialBoundsTests.cpp
+++ b/Tests/Core/Surfaces/RadialBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Radial Bounds Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/RectangleBoundsTests.cpp b/Tests/Core/Surfaces/RectangleBoundsTests.cpp
index d45acec29..9a70ff145 100644
--- a/Tests/Core/Surfaces/RectangleBoundsTests.cpp
+++ b/Tests/Core/Surfaces/RectangleBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Rectangle Bounds Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/StrawSurfaceTests.cpp b/Tests/Core/Surfaces/StrawSurfaceTests.cpp
index b4fc1fb5c..b49d76602 100644
--- a/Tests/Core/Surfaces/StrawSurfaceTests.cpp
+++ b/Tests/Core/Surfaces/StrawSurfaceTests.cpp
@@ -8,7 +8,8 @@
 
 #define BOOST_TEST_MODULE StrawSurface Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <boost/test/data/test_case.hpp>
diff --git a/Tests/Core/Surfaces/SurfaceArrayTests.cpp b/Tests/Core/Surfaces/SurfaceArrayTests.cpp
index 73dfe7c98..2704ab90d 100644
--- a/Tests/Core/Surfaces/SurfaceArrayTests.cpp
+++ b/Tests/Core/Surfaces/SurfaceArrayTests.cpp
@@ -7,10 +7,12 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #define BOOST_TEST_MODULE SurfaceArray
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include <boost/format.hpp>
 #include <boost/test/data/test_case.hpp>
+#include <boost/test/tools/output_test_stream.hpp>
 
 #include "Acts/Surfaces/CylinderBounds.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
@@ -25,6 +27,8 @@
 #include "Acts/Utilities/VariantData.hpp"
 #include "Acts/Utilities/detail/Grid.hpp"
 
+#include <fstream>
+
 using Acts::VectorHelpers::phi;
 using Acts::VectorHelpers::perp;
 
diff --git a/Tests/Core/Surfaces/SurfaceBoundsTests.cpp b/Tests/Core/Surfaces/SurfaceBoundsTests.cpp
index e44135db2..c6b3583df 100644
--- a/Tests/Core/Surfaces/SurfaceBoundsTests.cpp
+++ b/Tests/Core/Surfaces/SurfaceBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 #define BOOST_TEST_MODULE Surface Bounds Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <boost/test/data/test_case.hpp>
diff --git a/Tests/Core/Surfaces/SurfaceTests.cpp b/Tests/Core/Surfaces/SurfaceTests.cpp
index 2d7718d9b..1013a5dc7 100644
--- a/Tests/Core/Surfaces/SurfaceTests.cpp
+++ b/Tests/Core/Surfaces/SurfaceTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Surface Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/TrapezoidBoundsTests.cpp b/Tests/Core/Surfaces/TrapezoidBoundsTests.cpp
index 77e84943f..dc1494293 100644
--- a/Tests/Core/Surfaces/TrapezoidBoundsTests.cpp
+++ b/Tests/Core/Surfaces/TrapezoidBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Trapezoid Bounds Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Surfaces/TriangleBoundsTests.cpp b/Tests/Core/Surfaces/TriangleBoundsTests.cpp
index 11f20d7d3..83fbd0f63 100644
--- a/Tests/Core/Surfaces/TriangleBoundsTests.cpp
+++ b/Tests/Core/Surfaces/TriangleBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Triangle Bounds Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Tools/CMakeLists.txt b/Tests/Core/Tools/CMakeLists.txt
index 367d2ceb6..e9da7e273 100644
--- a/Tests/Core/Tools/CMakeLists.txt
+++ b/Tests/Core/Tools/CMakeLists.txt
@@ -1,24 +1,24 @@
 add_executable (CylinderVolumeBuilderTests CylinderVolumeBuilderTests.cpp)
-target_link_libraries (CylinderVolumeBuilderTests PRIVATE ActsCore)
+target_link_libraries (CylinderVolumeBuilderTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME CylinderVolumeBuilderUnitTest COMMAND CylinderVolumeBuilderTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST CylinderVolumeBuilderUnitTest TARGETS CylinderVolumeBuilderTests)
 
 add_executable (SurfaceArrayCreatorTests SurfaceArrayCreatorTests.cpp)
-target_link_libraries (SurfaceArrayCreatorTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (SurfaceArrayCreatorTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME SurfaceArrayCreatorUnitTest COMMAND SurfaceArrayCreatorTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST SurfaceArrayCreatorUnitTest TARGETS SurfaceArrayCreatorTests)
 
 add_executable (LayerCreatorTests LayerCreatorTests.cpp)
-target_link_libraries (LayerCreatorTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (LayerCreatorTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME LayerCreatorUnitTest COMMAND LayerCreatorTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST LayerCreatorUnitTest TARGETS LayerCreatorTests)
 
 add_executable (SimpleGeometryTests SimpleGeometryTests.cpp)
-target_link_libraries (SimpleGeometryTests PRIVATE ActsCore)
+target_link_libraries (SimpleGeometryTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME SimpleGeometryUnitTest COMMAND SimpleGeometryTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST SimpleGeometryUnitTest TARGETS SimpleGeometryTests)
 
 add_executable (CuboidVolumeBuilderTests CuboidVolumeBuilderTests.cpp)
-target_link_libraries (CuboidVolumeBuilderTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (CuboidVolumeBuilderTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME CuboidVolumeBuilderUnitTest COMMAND CuboidVolumeBuilderTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST CuboidVolumeBuilderUnitTest TARGETS CuboidVolumeBuilderTests)
diff --git a/Tests/Core/Tools/CuboidVolumeBuilderTests.cpp b/Tests/Core/Tools/CuboidVolumeBuilderTests.cpp
index e7bcfb9e6..9d5edd736 100644
--- a/Tests/Core/Tools/CuboidVolumeBuilderTests.cpp
+++ b/Tests/Core/Tools/CuboidVolumeBuilderTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE CuboidVolumeBuilderTest
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <vector>
diff --git a/Tests/Core/Tools/CylinderVolumeBuilderTests.cpp b/Tests/Core/Tools/CylinderVolumeBuilderTests.cpp
index b47372b2f..bbcbd0445 100644
--- a/Tests/Core/Tools/CylinderVolumeBuilderTests.cpp
+++ b/Tests/Core/Tools/CylinderVolumeBuilderTests.cpp
@@ -7,7 +7,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #define BOOST_TEST_MODULE Cylinder Volume Builder Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include <boost/test/data/test_case.hpp>
 #include "Acts/Tools/CylinderVolumeBuilder.hpp"
diff --git a/Tests/Core/Tools/LayerCreatorTests.cpp b/Tests/Core/Tools/LayerCreatorTests.cpp
index 59ea3dea8..e03db06b6 100644
--- a/Tests/Core/Tools/LayerCreatorTests.cpp
+++ b/Tests/Core/Tools/LayerCreatorTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE LayerCreator
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/format.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
diff --git a/Tests/Core/Tools/SimpleGeometryTests.cpp b/Tests/Core/Tools/SimpleGeometryTests.cpp
index 0e58daf78..8857b609a 100644
--- a/Tests/Core/Tools/SimpleGeometryTests.cpp
+++ b/Tests/Core/Tools/SimpleGeometryTests.cpp
@@ -8,7 +8,8 @@
 
 #define BOOST_TEST_MODULE SimpleGeometryTest
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include "Acts/Detector/TrackingGeometry.hpp"
 #include "Acts/Tools/CylinderVolumeBuilder.hpp"
 #include "Acts/Tools/CylinderVolumeHelper.hpp"
diff --git a/Tests/Core/Tools/SurfaceArrayCreatorTests.cpp b/Tests/Core/Tools/SurfaceArrayCreatorTests.cpp
index b7fb36f8c..5c00ef7e4 100644
--- a/Tests/Core/Tools/SurfaceArrayCreatorTests.cpp
+++ b/Tests/Core/Tools/SurfaceArrayCreatorTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE SurfaceArrayCreator
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/format.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
diff --git a/Tests/Core/Utilities/AxesTests.cpp b/Tests/Core/Utilities/AxesTests.cpp
index 0864a95fe..67edf1827 100644
--- a/Tests/Core/Utilities/AxesTests.cpp
+++ b/Tests/Core/Utilities/AxesTests.cpp
@@ -7,7 +7,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #define BOOST_TEST_MODULE grid axis tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include "Acts/Utilities/detail/Axis.hpp"
 
diff --git a/Tests/Core/Utilities/BFieldMapUtilsTests.cpp b/Tests/Core/Utilities/BFieldMapUtilsTests.cpp
index 5f12f3423..e0236415a 100644
--- a/Tests/Core/Utilities/BFieldMapUtilsTests.cpp
+++ b/Tests/Core/Utilities/BFieldMapUtilsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE bfield utils test
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
 
diff --git a/Tests/Core/Utilities/BinUtilityTests.cpp b/Tests/Core/Utilities/BinUtilityTests.cpp
index cef24aab3..116e506d9 100644
--- a/Tests/Core/Utilities/BinUtilityTests.cpp
+++ b/Tests/Core/Utilities/BinUtilityTests.cpp
@@ -8,7 +8,8 @@
 
 // Boost include(s)
 #define BOOST_TEST_MODULE BinUtility Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include "Acts/Utilities/BinUtility.hpp"
 #include "Acts/Utilities/BinningData.hpp"
 #include "Acts/Utilities/BinningType.hpp"
diff --git a/Tests/Core/Utilities/BinningDataTests.cpp b/Tests/Core/Utilities/BinningDataTests.cpp
index b23cca50c..33a126011 100644
--- a/Tests/Core/Utilities/BinningDataTests.cpp
+++ b/Tests/Core/Utilities/BinningDataTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE BinningData Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <cmath>
diff --git a/Tests/Core/Utilities/CMakeLists.txt b/Tests/Core/Utilities/CMakeLists.txt
index cb544722c..9ef9f4e3f 100644
--- a/Tests/Core/Utilities/CMakeLists.txt
+++ b/Tests/Core/Utilities/CMakeLists.txt
@@ -1,65 +1,65 @@
 add_executable (ExtendableTests ExtendableTests.cpp)
-target_link_libraries (ExtendableTests PRIVATE ActsCore)
+target_link_libraries (ExtendableTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME ExtendableUnitTests COMMAND ExtendableTests)
 
 add_executable (UnitConversionTests UnitConversionTests.cpp)
-target_link_libraries (UnitConversionTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (UnitConversionTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME UnitConversionUnitTest COMMAND UnitConversionTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST UnitConversionUnitTest TARGETS UnitConversionTests)
 
 add_executable (GeometryIDTests GeometryIDTests.cpp)
-target_link_libraries (GeometryIDTests PRIVATE ActsCore)
+target_link_libraries (GeometryIDTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME GeometryIDUnitTest COMMAND GeometryIDTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST GeometryIDUnitTest TARGETS GeometryIDTests)
 
 add_executable (IntersectionTests IntersectionTests.cpp)
-target_link_libraries (IntersectionTests PRIVATE ActsCore)
+target_link_libraries (IntersectionTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME IntersectionUnitTests COMMAND IntersectionTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST IntersectionUnitTests TARGETS IntersectionTests)
 
 add_executable (BinningDataTests BinningDataTests.cpp)
-target_link_libraries (BinningDataTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (BinningDataTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME BinningDataUnitTest COMMAND BinningDataTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST BinningDataUnitTest TARGETS BinningDataTests)
 
 add_executable (BinUtilityTests BinUtilityTests.cpp)
-target_link_libraries (BinUtilityTests PRIVATE ActsCore)
+target_link_libraries (BinUtilityTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME BinUtilityUnitTest COMMAND BinUtilityTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST BinUtilityUnitTest TARGETS BinUtilityTests)
 
 add_executable (LoggerTests LoggerTests.cpp)
-target_link_libraries (LoggerTests PRIVATE ActsCore)
+target_link_libraries (LoggerTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME LoggerUnitTest COMMAND LoggerTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST LoggerUnitTest TARGETS LoggerTests)
 
 add_executable (MPLTests MPLTests.cpp)
-target_link_libraries (MPLTests PRIVATE ActsCore)
+target_link_libraries (MPLTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME MPLUnitTest COMMAND MPLTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST MPLUnitTest TARGETS MPLTests)
 
 add_executable (RealQuadraticEquationTests RealQuadraticEquationTests.cpp)
-target_link_libraries (RealQuadraticEquationTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (RealQuadraticEquationTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME RealQuadraticEquationUnitTest COMMAND RealQuadraticEquationTests)
 
 add_executable (AxesTests AxesTests.cpp)
 target_include_directories (AxesTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (AxesTests PRIVATE ActsCore)
+target_link_libraries (AxesTests PRIVATE ActsCore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME AxesUnitTest COMMAND AxesTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST AxesUnitTest TARGETS AxesTests)
 
 add_executable (GridTests GridTests.cpp)
 target_include_directories (GridTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (GridTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (GridTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME GridUnitTest COMMAND GridTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST GridUnitTest TARGETS GridTests)
 
 add_executable (InterpolationTests InterpolationTests.cpp)
 target_include_directories (InterpolationTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (InterpolationTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (InterpolationTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME InterpolationUnitTest COMMAND InterpolationTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST InterpolationUnitTest TARGETS InterpolationTests)
 
 add_executable (BFieldMapUtilsTests BFieldMapUtilsTests.cpp)
-target_link_libraries (BFieldMapUtilsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (BFieldMapUtilsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME BFieldMapUtilsTest COMMAND BFieldMapUtilsTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST BFieldMapUtilsTest TARGETS BFieldMapUtilsTests)
diff --git a/Tests/Core/Utilities/ExtendableTests.cpp b/Tests/Core/Utilities/ExtendableTests.cpp
index bc04165df..32f490d63 100644
--- a/Tests/Core/Utilities/ExtendableTests.cpp
+++ b/Tests/Core/Utilities/ExtendableTests.cpp
@@ -9,7 +9,8 @@
 ///  Boost include(s)
 #define BOOST_TEST_MODULE Extendable Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank line
 
 #include <boost/test/data/test_case.hpp>
diff --git a/Tests/Core/Utilities/GeometryIDTests.cpp b/Tests/Core/Utilities/GeometryIDTests.cpp
index 4c1c8203c..2ce9bd121 100644
--- a/Tests/Core/Utilities/GeometryIDTests.cpp
+++ b/Tests/Core/Utilities/GeometryIDTests.cpp
@@ -8,7 +8,8 @@
 
 // Boost include(s)
 #define BOOST_TEST_MODULE GeometryID Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include "Acts/Utilities/GeometryID.hpp"
 #include "Acts/Utilities/Helpers.hpp"
 
diff --git a/Tests/Core/Utilities/GridTests.cpp b/Tests/Core/Utilities/GridTests.cpp
index ba86bd6f7..eb7093e15 100644
--- a/Tests/Core/Utilities/GridTests.cpp
+++ b/Tests/Core/Utilities/GridTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE grid tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <chrono>
diff --git a/Tests/Core/Utilities/InterpolationTests.cpp b/Tests/Core/Utilities/InterpolationTests.cpp
index efc29dc50..b5d051903 100644
--- a/Tests/Core/Utilities/InterpolationTests.cpp
+++ b/Tests/Core/Utilities/InterpolationTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE interpolation tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
diff --git a/Tests/Core/Utilities/IntersectionTests.cpp b/Tests/Core/Utilities/IntersectionTests.cpp
index 3899fcfed..f954660c7 100644
--- a/Tests/Core/Utilities/IntersectionTests.cpp
+++ b/Tests/Core/Utilities/IntersectionTests.cpp
@@ -9,7 +9,8 @@
 // Boost include(s)
 #define BOOST_TEST_MODULE GeometryID Tests
 #include <algorithm>
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Utilities/Intersection.hpp"
 
@@ -201,4 +202,4 @@ namespace Test {
   }
 
 }  // namespace Test
-}  // namespace Acts
\ No newline at end of file
+}  // namespace Acts
diff --git a/Tests/Core/Utilities/LoggerTests.cpp b/Tests/Core/Utilities/LoggerTests.cpp
index 2658780c3..33b83c47f 100644
--- a/Tests/Core/Utilities/LoggerTests.cpp
+++ b/Tests/Core/Utilities/LoggerTests.cpp
@@ -9,7 +9,8 @@
 /// @file Logger_tests.cpp
 
 #define BOOST_TEST_MODULE Logger Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <fstream>
 #include <string>
 #include "Acts/Utilities/Logger.hpp"
diff --git a/Tests/Core/Utilities/MPLTests.cpp b/Tests/Core/Utilities/MPLTests.cpp
index 3ab328637..1e7654797 100644
--- a/Tests/Core/Utilities/MPLTests.cpp
+++ b/Tests/Core/Utilities/MPLTests.cpp
@@ -11,7 +11,8 @@
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/set.hpp>
 #include <boost/mpl/vector.hpp>
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <type_traits>
 #include "Acts/Utilities/detail/MPL/all_of.hpp"
 #include "Acts/Utilities/detail/MPL/any_of.hpp"
diff --git a/Tests/Core/Utilities/RealQuadraticEquationTests.cpp b/Tests/Core/Utilities/RealQuadraticEquationTests.cpp
index 735ed8817..e53065350 100644
--- a/Tests/Core/Utilities/RealQuadraticEquationTests.cpp
+++ b/Tests/Core/Utilities/RealQuadraticEquationTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE RealQuadraticEquation Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Utilities/UnitConversionTests.cpp b/Tests/Core/Utilities/UnitConversionTests.cpp
index f3040ecb6..babe0d02a 100644
--- a/Tests/Core/Utilities/UnitConversionTests.cpp
+++ b/Tests/Core/Utilities/UnitConversionTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Unit Conversion Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
diff --git a/Tests/Core/Vertexing/CMakeLists.txt b/Tests/Core/Vertexing/CMakeLists.txt
index fbcdecd42..e672564b5 100644
--- a/Tests/Core/Vertexing/CMakeLists.txt
+++ b/Tests/Core/Vertexing/CMakeLists.txt
@@ -1,11 +1,11 @@
 add_executable (FullBilloirVertexFitterTests FullBilloirVertexFitterTests.cpp)
 target_include_directories (FullBilloirVertexFitterTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (FullBilloirVertexFitterTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (FullBilloirVertexFitterTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME FullBilloirVertexFitterUnitTests COMMAND FullBilloirVertexFitterTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST FullBilloirVertexFitterUnitTests TARGETS FullBilloirVertexFitterTests)
 
 add_executable (LinearizedTrackFactoryTests LinearizedTrackFactoryTests.cpp)
 target_include_directories (LinearizedTrackFactoryTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (LinearizedTrackFactoryTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (LinearizedTrackFactoryTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME LinearizedTrackFactoryUnitTests COMMAND LinearizedTrackFactoryTests)
-acts_add_test_to_cdash_project (PROJECT ACore TEST LinearizedTrackFactoryUnitTests TARGETS LinearizedTrackFactoryTests)
\ No newline at end of file
+acts_add_test_to_cdash_project (PROJECT ACore TEST LinearizedTrackFactoryUnitTests TARGETS LinearizedTrackFactoryTests)
diff --git a/Tests/Core/Vertexing/FullBilloirVertexFitterTests.cpp b/Tests/Core/Vertexing/FullBilloirVertexFitterTests.cpp
index 2733771f3..34b7b6e70 100644
--- a/Tests/Core/Vertexing/FullBilloirVertexFitterTests.cpp
+++ b/Tests/Core/Vertexing/FullBilloirVertexFitterTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE FullBilloirVertexFitter Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Vertexing/LinearizedTrackFactoryTests.cpp b/Tests/Core/Vertexing/LinearizedTrackFactoryTests.cpp
index 391c842e2..ec048b42c 100644
--- a/Tests/Core/Vertexing/LinearizedTrackFactoryTests.cpp
+++ b/Tests/Core/Vertexing/LinearizedTrackFactoryTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE LinearizedTrackFactory Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/output_test_stream.hpp>
 // clang-format on
diff --git a/Tests/Core/Volumes/CMakeLists.txt b/Tests/Core/Volumes/CMakeLists.txt
index 3bf6f1e91..76d08999a 100644
--- a/Tests/Core/Volumes/CMakeLists.txt
+++ b/Tests/Core/Volumes/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_executable (CylinderVolumeBoundsTests CylinderVolumeBoundsTests.cpp)
 target_include_directories (CylinderVolumeBoundsTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (CylinderVolumeBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (CylinderVolumeBoundsTests PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test(NAME CylinderVolumeBoundsUnitTest COMMAND CylinderVolumeBoundsTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST CylinderVolumeBoundsUnitTest TARGETS CylinderVolumeBoundsTests)
diff --git a/Tests/Core/Volumes/CylinderVolumeBoundsTests.cpp b/Tests/Core/Volumes/CylinderVolumeBoundsTests.cpp
index 554451086..b9b83d8c1 100644
--- a/Tests/Core/Volumes/CylinderVolumeBoundsTests.cpp
+++ b/Tests/Core/Volumes/CylinderVolumeBoundsTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Cylinder Volume Bounds Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
 
diff --git a/Tests/Integration/ATLSeedingIntegrationTest.cpp b/Tests/Integration/ATLSeedingIntegrationTest.cpp
index e77082411..a67a2a90c 100644
--- a/Tests/Integration/ATLSeedingIntegrationTest.cpp
+++ b/Tests/Integration/ATLSeedingIntegrationTest.cpp
@@ -10,7 +10,8 @@
 #include "Acts/Seeding/ATL_Seedmaker.hpp"
 
 #define BOOST_TEST_MODULE SeedmakerIntegrationTest
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 // space point structure with the bare minimum and reasonable default
 // covariances. clusterList default is SCT (strip detector)
diff --git a/Tests/Integration/CMakeLists.txt b/Tests/Integration/CMakeLists.txt
index 8544e76af..26a886fb7 100644
--- a/Tests/Integration/CMakeLists.txt
+++ b/Tests/Integration/CMakeLists.txt
@@ -10,13 +10,13 @@ macro(add_integration_test)
 endmacro()
 
 add_executable (PropagationTests PropagationTests.cpp)
-target_link_libraries (PropagationTests PRIVATE ActsCore ActsLegacy ActsTestsCommonHelpers)
+target_link_libraries (PropagationTests PRIVATE ActsCore ActsLegacy ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_integration_test(PropagationTests)
 
 add_executable (SeedingTest ATLSeedingIntegrationTest.cpp)
-target_link_libraries (SeedingTest PRIVATE ActsLegacy)
+target_link_libraries (SeedingTest PRIVATE ActsLegacy ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_integration_test(SeedingTest)
 
 add_executable (InterpolatedSolenoidBFieldTest InterpolatedSolenoidBFieldTest.cpp)
-target_link_libraries (InterpolatedSolenoidBFieldTest PRIVATE ActsCore ActsTestsCommonHelpers)
+target_link_libraries (InterpolatedSolenoidBFieldTest PRIVATE ActsCore ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_integration_test(InterpolatedSolenoidBFieldTest)
diff --git a/Tests/Integration/InterpolatedSolenoidBFieldTest.cpp b/Tests/Integration/InterpolatedSolenoidBFieldTest.cpp
index 9079bfd1f..10e60b943 100644
--- a/Tests/Integration/InterpolatedSolenoidBFieldTest.cpp
+++ b/Tests/Integration/InterpolatedSolenoidBFieldTest.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE MagneticField Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
 
diff --git a/Tests/Integration/PropagationTestBase.hpp b/Tests/Integration/PropagationTestBase.hpp
index 8e0e4878d..ae83ab437 100644
--- a/Tests/Integration/PropagationTestBase.hpp
+++ b/Tests/Integration/PropagationTestBase.hpp
@@ -8,12 +8,15 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Propagator Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
 
 #include <cmath>
 
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 
 /// test consistency of forward-backward propagation
diff --git a/Tests/Integration/PropagationTests.cpp b/Tests/Integration/PropagationTests.cpp
index 051dac8dc..1ef029565 100644
--- a/Tests/Integration/PropagationTests.cpp
+++ b/Tests/Integration/PropagationTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE Propagator Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
 
diff --git a/Tests/Integration/PropagationTestsAtlasField.cpp b/Tests/Integration/PropagationTestsAtlasField.cpp
index 03cf82be3..a30320921 100644
--- a/Tests/Integration/PropagationTestsAtlasField.cpp
+++ b/Tests/Integration/PropagationTestsAtlasField.cpp
@@ -9,7 +9,8 @@
 // Boost include(s)
 #define BOOST_TEST_MODULE Propagator Tests
 
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // leave blank
 #include <boost/test/data/test_case.hpp>
 
diff --git a/Tests/Legacy/Extrapolation/ExtrapolationCellTests.cpp b/Tests/Legacy/Extrapolation/ExtrapolationCellTests.cpp
index 8b39b2299..7600a1105 100644
--- a/Tests/Legacy/Extrapolation/ExtrapolationCellTests.cpp
+++ b/Tests/Legacy/Extrapolation/ExtrapolationCellTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE ExtrapolationCell Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include "Acts/EventData/NeutralParameters.hpp"
diff --git a/Tests/Plugins/Digitization/CMakeLists.txt b/Tests/Plugins/Digitization/CMakeLists.txt
index fbc55b7bc..5ca02df11 100644
--- a/Tests/Plugins/Digitization/CMakeLists.txt
+++ b/Tests/Plugins/Digitization/CMakeLists.txt
@@ -1,15 +1,15 @@
 add_executable (ClusterizationTests ClusterizationTests.cpp)
 target_include_directories (ClusterizationTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries (ClusterizationTests PRIVATE ActsCore ActsDigitizationPlugin ActsTestsCommonHelpers)
+target_link_libraries (ClusterizationTests PRIVATE ActsCore ActsDigitizationPlugin ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME ClusterizationUnitTest COMMAND ClusterizationTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST ClusterizationUnitTest TARGETS ClusterizationTests)
 
 add_executable (SingleHitSpacePointBuilderTests SingleHitSpacePointBuilderTests.cpp)
-target_link_libraries (SingleHitSpacePointBuilderTests PRIVATE ActsCore ActsDigitizationPlugin ActsTestsCommonHelpers)
+target_link_libraries (SingleHitSpacePointBuilderTests PRIVATE ActsCore ActsDigitizationPlugin ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME SingleHitSpacePointBuilderUnitTest COMMAND SingleHitSpacePointBuilderTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST SingleHitSpacePointBuilderUnitTest TARGETS SingleHitSpacePointBuilderTests)
 
 add_executable (DoubleHitSpacePointBuilderTests DoubleHitSpacePointBuilderTests.cpp)
-target_link_libraries (DoubleHitSpacePointBuilderTests PRIVATE ActsCore ActsDigitizationPlugin ActsTestsCommonHelpers)
+target_link_libraries (DoubleHitSpacePointBuilderTests PRIVATE ActsCore ActsDigitizationPlugin ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME DoubleHitSpacePointBuilderUnitTest COMMAND DoubleHitSpacePointBuilderTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST DoubleHitSpacePointBuilderUnitTest TARGETS DoubleHitSpacePointBuilderTests)
diff --git a/Tests/Plugins/Digitization/ClusterizationTests.cpp b/Tests/Plugins/Digitization/ClusterizationTests.cpp
index 9ab254949..44121cb35 100644
--- a/Tests/Plugins/Digitization/ClusterizationTests.cpp
+++ b/Tests/Plugins/Digitization/ClusterizationTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE CreateClusters Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <boost/test/data/test_case.hpp>
 // clang-format on
 
diff --git a/Tests/Plugins/Digitization/DoubleHitSpacePointBuilderTests.cpp b/Tests/Plugins/Digitization/DoubleHitSpacePointBuilderTests.cpp
index 966948fb2..cd36b4cf6 100644
--- a/Tests/Plugins/Digitization/DoubleHitSpacePointBuilderTests.cpp
+++ b/Tests/Plugins/Digitization/DoubleHitSpacePointBuilderTests.cpp
@@ -7,7 +7,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #define BOOST_TEST_MODULE Strip Space Point Builder Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include <boost/test/data/test_case.hpp>
 #include "Acts/Plugins/Digitization/DoubleHitSpacePointBuilder.hpp"
diff --git a/Tests/Plugins/Digitization/SingleHitSpacePointBuilderTests.cpp b/Tests/Plugins/Digitization/SingleHitSpacePointBuilderTests.cpp
index 94638a198..edbab6201 100644
--- a/Tests/Plugins/Digitization/SingleHitSpacePointBuilderTests.cpp
+++ b/Tests/Plugins/Digitization/SingleHitSpacePointBuilderTests.cpp
@@ -7,7 +7,8 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #define BOOST_TEST_MODULE Pixel Space Point Builder Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 
 #include <boost/test/data/test_case.hpp>
 #include "Acts/Plugins/Digitization/SingleHitSpacePointBuilder.hpp"
diff --git a/Tests/Plugins/Json/CMakeLists.txt b/Tests/Plugins/Json/CMakeLists.txt
index 83e76ca86..81ce8e617 100644
--- a/Tests/Plugins/Json/CMakeLists.txt
+++ b/Tests/Plugins/Json/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_executable (FromJsonTests FromJsonTests.cpp)
 target_include_directories (FromJsonTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(FromJsonTests PRIVATE ActsCore ActsJsonPlugin ActsTestsCommonHelpers)
+target_link_libraries(FromJsonTests PRIVATE ActsCore ActsJsonPlugin ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME FromJsonUnitTest COMMAND FromJsonTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST FromJsonUnitTest TARGETS FromJsonTests)
diff --git a/Tests/Plugins/Json/FromJsonTests.cpp b/Tests/Plugins/Json/FromJsonTests.cpp
index 5df1f21c7..8c810a130 100644
--- a/Tests/Plugins/Json/FromJsonTests.cpp
+++ b/Tests/Plugins/Json/FromJsonTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE FromJson Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <climits>
diff --git a/Tests/Plugins/MaterialMapping/AccumulatedMaterialPropertiesTests.cpp b/Tests/Plugins/MaterialMapping/AccumulatedMaterialPropertiesTests.cpp
index a0ed6d59c..36d263df4 100644
--- a/Tests/Plugins/MaterialMapping/AccumulatedMaterialPropertiesTests.cpp
+++ b/Tests/Plugins/MaterialMapping/AccumulatedMaterialPropertiesTests.cpp
@@ -8,7 +8,8 @@
 
 // clang-format off
 #define BOOST_TEST_MODULE AccumulatedMaterialProperties Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 // clang-format on
 
 #include <climits>
diff --git a/Tests/Plugins/MaterialMapping/AccumulatedSurfaceMaterialTests.cpp b/Tests/Plugins/MaterialMapping/AccumulatedSurfaceMaterialTests.cpp
index 31978abb7..d77a3f123 100644
--- a/Tests/Plugins/MaterialMapping/AccumulatedSurfaceMaterialTests.cpp
+++ b/Tests/Plugins/MaterialMapping/AccumulatedSurfaceMaterialTests.cpp
@@ -8,7 +8,8 @@
 
 ///  Boost include(s)
 #define BOOST_TEST_MODULE AccumulatedSurfaceMaterial Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include <climits>
 #include "Acts/Material/SurfaceMaterial.hpp"
 #include "Acts/Plugins/MaterialMapping/AccumulatedSurfaceMaterial.hpp"
@@ -125,4 +126,4 @@ namespace Test {
   }
 
 }  // namespace Test
-}  // namespace Acts
\ No newline at end of file
+}  // namespace Acts
diff --git a/Tests/Plugins/MaterialMapping/CMakeLists.txt b/Tests/Plugins/MaterialMapping/CMakeLists.txt
index 6235d040a..eac06e71e 100644
--- a/Tests/Plugins/MaterialMapping/CMakeLists.txt
+++ b/Tests/Plugins/MaterialMapping/CMakeLists.txt
@@ -1,18 +1,18 @@
 add_executable (AccumulatedMaterialPropertiesTests AccumulatedMaterialPropertiesTests.cpp)
 target_include_directories (AccumulatedMaterialPropertiesTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(AccumulatedMaterialPropertiesTests PRIVATE ActsCore ActsMaterialMappingPlugin ActsTestsCommonHelpers)
+target_link_libraries(AccumulatedMaterialPropertiesTests PRIVATE ActsCore ActsMaterialMappingPlugin ActsTestsCommonHelpers ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME AccumulatedMaterialPropertiesUnitTest COMMAND AccumulatedMaterialPropertiesTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST AccumulatedMaterialPropertiesUnitTest TARGETS AccumulatedMaterialPropertiesTests)
 
 add_executable (AccumulatedSurfaceMaterialTests AccumulatedSurfaceMaterialTests.cpp)
 target_include_directories (AccumulatedSurfaceMaterialTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(AccumulatedSurfaceMaterialTests PRIVATE ActsCore ActsMaterialMappingPlugin)
+target_link_libraries(AccumulatedSurfaceMaterialTests PRIVATE ActsCore ActsMaterialMappingPlugin ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME AccumulatedSurfaceMaterialUnitTest COMMAND AccumulatedSurfaceMaterialTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST AccumulatedSurfaceMaterialUnitTest TARGETS AccumulatedSurfaceMaterialTests)
 
 add_executable (SurfaceMaterialMapperTests SurfaceMaterialMapperTests.cpp)
 target_include_directories (SurfaceMaterialMapperTests PRIVATE ${Boost_INCLUDE_DIRS})
-target_link_libraries(SurfaceMaterialMapperTests PRIVATE ActsCore ActsMaterialMappingPlugin)
+target_link_libraries(SurfaceMaterialMapperTests PRIVATE ActsCore ActsMaterialMappingPlugin ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 add_test (NAME SurfaceMaterialMapperUnitTest COMMAND SurfaceMaterialMapperTests)
 acts_add_test_to_cdash_project (PROJECT ACore TEST SurfaceMaterialMapperUnitTest TARGETS SurfaceMaterialMapperTests)
 
diff --git a/Tests/Plugins/MaterialMapping/SurfaceMaterialMapperTests.cpp b/Tests/Plugins/MaterialMapping/SurfaceMaterialMapperTests.cpp
index c1a12e1bf..8f0cb3166 100644
--- a/Tests/Plugins/MaterialMapping/SurfaceMaterialMapperTests.cpp
+++ b/Tests/Plugins/MaterialMapping/SurfaceMaterialMapperTests.cpp
@@ -8,7 +8,8 @@
 
 ///  Boost include(s)
 #define BOOST_TEST_MODULE SurfaceMaterialMapper Tests
-#include <boost/test/included/unit_test.hpp>
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
 #include "Acts/Detector/TrackingGeometry.hpp"
 #include "Acts/Detector/TrackingVolume.hpp"
 #include "Acts/Material/MaterialProperties.hpp"
-- 
GitLab