diff --git a/Tests/Benchmarks/SurfaceIntersectionBenchmark.cpp b/Tests/Benchmarks/SurfaceIntersectionBenchmark.cpp
index 392e5367995..eb7c1f701bc 100644
--- a/Tests/Benchmarks/SurfaceIntersectionBenchmark.cpp
+++ b/Tests/Benchmarks/SurfaceIntersectionBenchmark.cpp
@@ -7,7 +7,6 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Units.hpp"
diff --git a/Tests/UnitTests/Core/Clusterization/ClusterizationTests1D.cpp b/Tests/UnitTests/Core/Clusterization/ClusterizationTests1D.cpp
index 760ee400041..83423852791 100644
--- a/Tests/UnitTests/Core/Clusterization/ClusterizationTests1D.cpp
+++ b/Tests/UnitTests/Core/Clusterization/ClusterizationTests1D.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Clusterization/Clusterization.hpp"
diff --git a/Tests/UnitTests/Core/Clusterization/ClusterizationTests2D.cpp b/Tests/UnitTests/Core/Clusterization/ClusterizationTests2D.cpp
index 27cfb0fafa1..e850d213551 100644
--- a/Tests/UnitTests/Core/Clusterization/ClusterizationTests2D.cpp
+++ b/Tests/UnitTests/Core/Clusterization/ClusterizationTests2D.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Clusterization/Clusterization.hpp"
diff --git a/Tests/UnitTests/Core/Detector/ProtoBinningTests.cpp b/Tests/UnitTests/Core/Detector/ProtoBinningTests.cpp
index 3edc3a2b176..47289a32ad9 100644
--- a/Tests/UnitTests/Core/Detector/ProtoBinningTests.cpp
+++ b/Tests/UnitTests/Core/Detector/ProtoBinningTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Detector/ProtoBinning.hpp"
diff --git a/Tests/UnitTests/Core/Detector/ProtoDetectorTests.cpp b/Tests/UnitTests/Core/Detector/ProtoDetectorTests.cpp
index 69c163d7cb3..74217cb94de 100644
--- a/Tests/UnitTests/Core/Detector/ProtoDetectorTests.cpp
+++ b/Tests/UnitTests/Core/Detector/ProtoDetectorTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/EventData/CorrectedTransformFreeToBoundTests.cpp b/Tests/UnitTests/Core/EventData/CorrectedTransformFreeToBoundTests.cpp
index 0991bcf3219..0c6e7809634 100644
--- a/Tests/UnitTests/Core/EventData/CorrectedTransformFreeToBoundTests.cpp
+++ b/Tests/UnitTests/Core/EventData/CorrectedTransformFreeToBoundTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/EventData/TrackStatePropMaskTests.cpp b/Tests/UnitTests/Core/EventData/TrackStatePropMaskTests.cpp
index 05f2187fcc6..3b5fabce6db 100644
--- a/Tests/UnitTests/Core/EventData/TrackStatePropMaskTests.cpp
+++ b/Tests/UnitTests/Core/EventData/TrackStatePropMaskTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/context.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/EventData/TrackStatePropMask.hpp"
diff --git a/Tests/UnitTests/Core/EventData/TrackTests.cpp b/Tests/UnitTests/Core/EventData/TrackTests.cpp
index 1af05431a6a..39b318a9c2a 100644
--- a/Tests/UnitTests/Core/EventData/TrackTests.cpp
+++ b/Tests/UnitTests/Core/EventData/TrackTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -49,7 +48,6 @@ using namespace Acts::HashedStringLiteral;
 using namespace Acts::detail::Test;
 
 using MultiTrajectoryTraits::IndexType;
-namespace bd = boost::unit_test::data;
 
 const GeometryContext gctx;
 // fixed seed for reproducible tests
diff --git a/Tests/UnitTests/Core/Geometry/ConeLayerTests.cpp b/Tests/UnitTests/Core/Geometry/ConeLayerTests.cpp
index 5c7d6980990..b495cae3c62 100644
--- a/Tests/UnitTests/Core/Geometry/ConeLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/ConeLayerTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/CylinderLayerTests.cpp b/Tests/UnitTests/Core/Geometry/CylinderLayerTests.cpp
index 1fbee1a4283..0b3ac7ab871 100644
--- a/Tests/UnitTests/Core/Geometry/CylinderLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/CylinderLayerTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp b/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp
index f2dd34aa879..121c9945972 100644
--- a/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/ExtentTests.cpp b/Tests/UnitTests/Core/Geometry/ExtentTests.cpp
index 41abb1860a2..422183b42c8 100644
--- a/Tests/UnitTests/Core/Geometry/ExtentTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/ExtentTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/GenericApproachDescriptorTests.cpp b/Tests/UnitTests/Core/Geometry/GenericApproachDescriptorTests.cpp
index 3bdabe7e7cc..8a265eeb686 100644
--- a/Tests/UnitTests/Core/Geometry/GenericApproachDescriptorTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/GenericApproachDescriptorTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/KDTreeTrackingGeometryBuilderTests.cpp b/Tests/UnitTests/Core/Geometry/KDTreeTrackingGeometryBuilderTests.cpp
index f9f5848be70..dbe86afb339 100644
--- a/Tests/UnitTests/Core/Geometry/KDTreeTrackingGeometryBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/KDTreeTrackingGeometryBuilderTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/LayerCreatorTests.cpp b/Tests/UnitTests/Core/Geometry/LayerCreatorTests.cpp
index 372132937a8..c0306af56d1 100644
--- a/Tests/UnitTests/Core/Geometry/LayerCreatorTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/LayerCreatorTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/LayerTests.cpp b/Tests/UnitTests/Core/Geometry/LayerTests.cpp
index 4b931aab45c..88b67b62a8a 100644
--- a/Tests/UnitTests/Core/Geometry/LayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/LayerTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/NavigationLayerTests.cpp b/Tests/UnitTests/Core/Geometry/NavigationLayerTests.cpp
index b40677975ea..556d13842b0 100644
--- a/Tests/UnitTests/Core/Geometry/NavigationLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/NavigationLayerTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/PlaneLayerTests.cpp b/Tests/UnitTests/Core/Geometry/PlaneLayerTests.cpp
index dba38bc4e52..d73825c97c9 100644
--- a/Tests/UnitTests/Core/Geometry/PlaneLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/PlaneLayerTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/PolyhedronTests.cpp b/Tests/UnitTests/Core/Geometry/PolyhedronTests.cpp
index f68f92fede0..0da6e2c3ee2 100644
--- a/Tests/UnitTests/Core/Geometry/PolyhedronTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/PolyhedronTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <cmath>
diff --git a/Tests/UnitTests/Core/Geometry/ProtoLayerHelperTests.cpp b/Tests/UnitTests/Core/Geometry/ProtoLayerHelperTests.cpp
index 6aeaadec4e5..7f9c009e5ca 100644
--- a/Tests/UnitTests/Core/Geometry/ProtoLayerHelperTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/ProtoLayerHelperTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/ProtoLayerTests.cpp b/Tests/UnitTests/Core/Geometry/ProtoLayerTests.cpp
index 16403621e5e..9564731d718 100644
--- a/Tests/UnitTests/Core/Geometry/ProtoLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/ProtoLayerTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/SurfaceArrayCreatorTests.cpp b/Tests/UnitTests/Core/Geometry/SurfaceArrayCreatorTests.cpp
index 8ef383b3d62..e657bbbe4e9 100644
--- a/Tests/UnitTests/Core/Geometry/SurfaceArrayCreatorTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/SurfaceArrayCreatorTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/SurfaceBinningMatcherTests.cpp b/Tests/UnitTests/Core/Geometry/SurfaceBinningMatcherTests.cpp
index 6133931eab0..4831f23b19e 100644
--- a/Tests/UnitTests/Core/Geometry/SurfaceBinningMatcherTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/SurfaceBinningMatcherTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Geometry/TrackingVolumeTests.cpp b/Tests/UnitTests/Core/Geometry/TrackingVolumeTests.cpp
index b2106b85589..24937324676 100644
--- a/Tests/UnitTests/Core/Geometry/TrackingVolumeTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/TrackingVolumeTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Units.hpp"
diff --git a/Tests/UnitTests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp b/Tests/UnitTests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp
index 06debb0ebeb..d22ae56e4d3 100644
--- a/Tests/UnitTests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/MagneticFieldInterfaceConsistencyTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp b/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
index 2325ed6b6a4..22f727e6231 100644
--- a/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp b/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp
index 79a5c94cd81..25e678133b1 100644
--- a/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp
+++ b/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Propagator/ConstrainedStepTests.cpp b/Tests/UnitTests/Core/Propagator/ConstrainedStepTests.cpp
index 6a703bf28f3..a5d381981ab 100644
--- a/Tests/UnitTests/Core/Propagator/ConstrainedStepTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/ConstrainedStepTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Propagator/ConstrainedStep.hpp"
diff --git a/Tests/UnitTests/Core/Propagator/DirectNavigatorTests.cpp b/Tests/UnitTests/Core/Propagator/DirectNavigatorTests.cpp
index fd4a3be45ff..44b5b73a620 100644
--- a/Tests/UnitTests/Core/Propagator/DirectNavigatorTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/DirectNavigatorTests.cpp
@@ -7,7 +7,6 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp b/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp
index 14abef62502..842590527b2 100644
--- a/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp
@@ -7,7 +7,6 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Propagator/JacobianTests.cpp b/Tests/UnitTests/Core/Propagator/JacobianTests.cpp
index e5791a7bff8..c58bab9ee69 100644
--- a/Tests/UnitTests/Core/Propagator/JacobianTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/JacobianTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp b/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp
index 40adfa055f8..ed58b98cb04 100644
--- a/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp
@@ -7,7 +7,6 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp b/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp
index ea9c06d7242..6c8e16d56df 100644
--- a/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp
@@ -7,7 +7,6 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Propagator/NavigatorTests.cpp b/Tests/UnitTests/Core/Propagator/NavigatorTests.cpp
index 9c8f75f2508..28365a673d0 100644
--- a/Tests/UnitTests/Core/Propagator/NavigatorTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/NavigatorTests.cpp
@@ -7,7 +7,6 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp b/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp
index 5c4f6945198..b8e29ba20dc 100644
--- a/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp
@@ -7,7 +7,6 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Surfaces/AnnulusBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/AnnulusBoundsTests.cpp
index eef2572cdd1..ba4d417398e 100644
--- a/Tests/UnitTests/Core/Surfaces/AnnulusBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/AnnulusBoundsTests.cpp
@@ -6,15 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-// clang-format off
 #include <boost/test/unit_test.hpp>
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
-#include <algorithm>
-#include <array>
-#include <stdexcept>
-#include <vector>
-// clang-format on
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Surfaces/AnnulusBounds.hpp"
@@ -22,6 +14,11 @@
 #include "Acts/Surfaces/SurfaceBounds.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
 
+#include <algorithm>
+#include <array>
+#include <stdexcept>
+#include <vector>
+
 namespace Acts {
 
 namespace Test {
diff --git a/Tests/UnitTests/Core/Surfaces/BoundaryCheckTests.cpp b/Tests/UnitTests/Core/Surfaces/BoundaryCheckTests.cpp
index 09b5da4a7f5..188818cf433 100644
--- a/Tests/UnitTests/Core/Surfaces/BoundaryCheckTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/BoundaryCheckTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Surfaces/ConeBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/ConeBoundsTests.cpp
index af5b7cd555c..25fac45aa7a 100644
--- a/Tests/UnitTests/Core/Surfaces/ConeBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/ConeBoundsTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/ConeSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/ConeSurfaceTests.cpp
index 691d60a6619..8aee4c889f1 100644
--- a/Tests/UnitTests/Core/Surfaces/ConeSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/ConeSurfaceTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 //#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
@@ -28,8 +27,6 @@
 #include <memory>
 #include <string>
 
-// using boost::test_tools::output_test_stream;
-
 namespace Acts::Test {
 
 // Create a test context
diff --git a/Tests/UnitTests/Core/Surfaces/CylinderBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/CylinderBoundsTests.cpp
index d030526db73..20cad05003e 100644
--- a/Tests/UnitTests/Core/Surfaces/CylinderBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/CylinderBoundsTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/CylinderSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/CylinderSurfaceTests.cpp
index afd5257d46c..d7e770a35bd 100644
--- a/Tests/UnitTests/Core/Surfaces/CylinderSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/CylinderSurfaceTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp
index 974cda9b51c..7ce6d1423b1 100644
--- a/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/DiscSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/DiscSurfaceTests.cpp
index a2068eeea67..895dfb01aa1 100644
--- a/Tests/UnitTests/Core/Surfaces/DiscSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/DiscSurfaceTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/DiscTrapezoidBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/DiscTrapezoidBoundsTests.cpp
index c0b8a8810c4..32625419bd3 100644
--- a/Tests/UnitTests/Core/Surfaces/DiscTrapezoidBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/DiscTrapezoidBoundsTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/EllipseBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/EllipseBoundsTests.cpp
index bdb2fb691b1..3568ac6d1cb 100644
--- a/Tests/UnitTests/Core/Surfaces/EllipseBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/EllipseBoundsTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/InfiniteBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/InfiniteBoundsTests.cpp
index b2f5431ebfb..926c371b28b 100644
--- a/Tests/UnitTests/Core/Surfaces/InfiniteBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/InfiniteBoundsTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/IntersectionHelper2DTests.cpp b/Tests/UnitTests/Core/Surfaces/IntersectionHelper2DTests.cpp
index ef70ab75391..58864aae33d 100644
--- a/Tests/UnitTests/Core/Surfaces/IntersectionHelper2DTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/IntersectionHelper2DTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Surfaces/LineBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/LineBoundsTests.cpp
index 5da663cbf4c..49bb1cc4db0 100644
--- a/Tests/UnitTests/Core/Surfaces/LineBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/LineBoundsTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/LineSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/LineSurfaceTests.cpp
index 9f91d0a6284..5b1a8428f18 100644
--- a/Tests/UnitTests/Core/Surfaces/LineSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/LineSurfaceTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/old/interface.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/PerigeeSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/PerigeeSurfaceTests.cpp
index 4e5024c2f24..9d89ae7059d 100644
--- a/Tests/UnitTests/Core/Surfaces/PerigeeSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/PerigeeSurfaceTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/PlaneSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/PlaneSurfaceTests.cpp
index 24e54ac8fbe..17ffbb2fb30 100644
--- a/Tests/UnitTests/Core/Surfaces/PlaneSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/PlaneSurfaceTests.cpp
@@ -6,8 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
+// #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Surfaces/PolyhedronSurfacesTests.cpp b/Tests/UnitTests/Core/Surfaces/PolyhedronSurfacesTests.cpp
index 1b8a2709421..ee80225e57a 100644
--- a/Tests/UnitTests/Core/Surfaces/PolyhedronSurfacesTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/PolyhedronSurfacesTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Units.hpp"
diff --git a/Tests/UnitTests/Core/Surfaces/RadialBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/RadialBoundsTests.cpp
index fd0895d8c77..a65d559fda2 100644
--- a/Tests/UnitTests/Core/Surfaces/RadialBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/RadialBoundsTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/RectangleBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/RectangleBoundsTests.cpp
index 0d5b1445e74..1417aee5233 100644
--- a/Tests/UnitTests/Core/Surfaces/RectangleBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/RectangleBoundsTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -22,7 +20,6 @@
 #include <stdexcept>
 #include <vector>
 
-namespace utf = boost::unit_test;
 const double inf = std::numeric_limits<double>::infinity();
 
 namespace Acts {
@@ -74,7 +71,7 @@ BOOST_AUTO_TEST_CASE(RadialBoundsException) {
 }
 
 /// Unit test for testing RectangleBounds properties
-BOOST_TEST_DECORATOR(*utf::tolerance(1e-10))
+BOOST_TEST_DECORATOR(*boost::unit_test::tolerance(1e-10))
 BOOST_AUTO_TEST_CASE(RectangleBoundsProperties) {
   const double halfX(10.), halfY(5.);
   RectangleBounds rect(halfX, halfY);
diff --git a/Tests/UnitTests/Core/Surfaces/StrawSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/StrawSurfaceTests.cpp
index b58985e2e9a..368dd0a86f8 100644
--- a/Tests/UnitTests/Core/Surfaces/StrawSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/StrawSurfaceTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
@@ -25,8 +24,6 @@ namespace Acts {
 class PlanarBounds;
 }  // namespace Acts
 
-namespace utf = boost::unit_test;
-
 namespace Acts::Test {
 
 // Create a test context
diff --git a/Tests/UnitTests/Core/Surfaces/SurfaceArrayTests.cpp b/Tests/UnitTests/Core/Surfaces/SurfaceArrayTests.cpp
index b41a17b786b..61098434728 100644
--- a/Tests/UnitTests/Core/Surfaces/SurfaceArrayTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/SurfaceArrayTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Surfaces/SurfaceBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/SurfaceBoundsTests.cpp
index 6ca948209ab..bf8af69ede3 100644
--- a/Tests/UnitTests/Core/Surfaces/SurfaceBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/SurfaceBoundsTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Surfaces/SurfaceIntersectionTests.cpp b/Tests/UnitTests/Core/Surfaces/SurfaceIntersectionTests.cpp
index 12665a2da6a..7a4b0a2de51 100644
--- a/Tests/UnitTests/Core/Surfaces/SurfaceIntersectionTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/SurfaceIntersectionTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Surfaces/SurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/SurfaceTests.cpp
index 725b306a2db..d15300cf7b1 100644
--- a/Tests/UnitTests/Core/Surfaces/SurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/SurfaceTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Surfaces/VerticesHelperTests.cpp b/Tests/UnitTests/Core/Surfaces/VerticesHelperTests.cpp
index 436e5de24c4..22f6783594a 100644
--- a/Tests/UnitTests/Core/Surfaces/VerticesHelperTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/VerticesHelperTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Utilities/AnnealingUtilityTests.cpp b/Tests/UnitTests/Core/Utilities/AnnealingUtilityTests.cpp
index cad4c95765e..175420491c1 100644
--- a/Tests/UnitTests/Core/Utilities/AnnealingUtilityTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/AnnealingUtilityTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Utilities/AnnealingUtility.hpp"
diff --git a/Tests/UnitTests/Core/Utilities/AnyTests.cpp b/Tests/UnitTests/Core/Utilities/AnyTests.cpp
index d0963d850be..eca009cbf22 100644
--- a/Tests/UnitTests/Core/Utilities/AnyTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/AnyTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Utilities/Any.hpp"
diff --git a/Tests/UnitTests/Core/Utilities/DelegateTests.cpp b/Tests/UnitTests/Core/Utilities/DelegateTests.cpp
index cd85a49491f..1a9273871e4 100644
--- a/Tests/UnitTests/Core/Utilities/DelegateTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/DelegateTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -21,8 +20,6 @@
 
 using namespace Acts;
 
-namespace bd = boost::unit_test::data;
-
 BOOST_AUTO_TEST_SUITE(DelegateTests)
 
 int sumImpl(int a, int b) {
diff --git a/Tests/UnitTests/Core/Utilities/ExtendableTests.cpp b/Tests/UnitTests/Core/Utilities/ExtendableTests.cpp
index 445ef1cb4ad..92d68fae1c9 100644
--- a/Tests/UnitTests/Core/Utilities/ExtendableTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/ExtendableTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Utilities/detail/Extendable.hpp"
diff --git a/Tests/UnitTests/Core/Utilities/FrustumTest.cpp b/Tests/UnitTests/Core/Utilities/FrustumTest.cpp
index c267c890be8..01090930f40 100644
--- a/Tests/UnitTests/Core/Utilities/FrustumTest.cpp
+++ b/Tests/UnitTests/Core/Utilities/FrustumTest.cpp
@@ -19,14 +19,12 @@
 #include <utility>
 #include <vector>
 
-using boost::test_tools::output_test_stream;
-
 namespace Acts {
 namespace Test {
 
 BOOST_AUTO_TEST_SUITE(Utilities)
 BOOST_AUTO_TEST_CASE(frustum_construction) {
-  output_test_stream output;
+  boost::test_tools::output_test_stream output;
 
   using Vector2F = Eigen::Matrix<float, 2, 1>;
 
diff --git a/Tests/UnitTests/Core/Utilities/GridAccessHelpersTests.cpp b/Tests/UnitTests/Core/Utilities/GridAccessHelpersTests.cpp
index 1c511930c38..33d9cb2bc21 100644
--- a/Tests/UnitTests/Core/Utilities/GridAccessHelpersTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/GridAccessHelpersTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -17,8 +16,6 @@
 
 using namespace Acts;
 
-namespace bd = boost::unit_test::data;
-
 BOOST_AUTO_TEST_SUITE(GridAccessHelpersTests)
 
 BOOST_AUTO_TEST_CASE(Grid1DAccess) {
diff --git a/Tests/UnitTests/Core/Utilities/MaterialMapUtilsTests.cpp b/Tests/UnitTests/Core/Utilities/MaterialMapUtilsTests.cpp
index 4f9c3561ca2..7d7aef745cc 100644
--- a/Tests/UnitTests/Core/Utilities/MaterialMapUtilsTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/MaterialMapUtilsTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -19,8 +18,6 @@
 #include <cstddef>
 #include <vector>
 
-namespace bdata = boost::unit_test::data;
-
 namespace Acts::Test {
 
 BOOST_AUTO_TEST_CASE(materialmap_creation) {
diff --git a/Tests/UnitTests/Core/Utilities/PeriodicTests.cpp b/Tests/UnitTests/Core/Utilities/PeriodicTests.cpp
index 82ee92d811f..c2e237cee23 100644
--- a/Tests/UnitTests/Core/Utilities/PeriodicTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/PeriodicTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/monomorphic.hpp>
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/RayTest.cpp b/Tests/UnitTests/Core/Utilities/RayTest.cpp
index dc74a306b04..9846088c51b 100644
--- a/Tests/UnitTests/Core/Utilities/RayTest.cpp
+++ b/Tests/UnitTests/Core/Utilities/RayTest.cpp
@@ -12,8 +12,6 @@
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 #include "Acts/Utilities/Ray.hpp"
 
-using boost::test_tools::output_test_stream;
-
 namespace Acts {
 namespace Test {
 
@@ -23,7 +21,7 @@ BOOST_AUTO_TEST_CASE(ray_construction) {
 
   using Vector2F = Eigen::Matrix<float, 2, 1>;
 
-  output_test_stream output;
+  boost::test_tools::output_test_stream output;
 
   Vector2F dir2(0.5, 0.5);
   Ray<float, 2> ray2({1, 1}, dir2);
diff --git a/Tests/UnitTests/Core/Utilities/RealQuadraticEquationTests.cpp b/Tests/UnitTests/Core/Utilities/RealQuadraticEquationTests.cpp
index e0de51ca32c..171d9664d6e 100644
--- a/Tests/UnitTests/Core/Utilities/RealQuadraticEquationTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/RealQuadraticEquationTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
diff --git a/Tests/UnitTests/Core/Utilities/TransformRangeTests.cpp b/Tests/UnitTests/Core/Utilities/TransformRangeTests.cpp
index 8b86e9af451..99e80b369f6 100644
--- a/Tests/UnitTests/Core/Utilities/TransformRangeTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/TransformRangeTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Utilities/TransformRange.hpp"
diff --git a/Tests/UnitTests/Core/Utilities/TypeListTests.cpp b/Tests/UnitTests/Core/Utilities/TypeListTests.cpp
index 4bb1b854bd1..d41d8bd48ea 100644
--- a/Tests/UnitTests/Core/Utilities/TypeListTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/TypeListTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Utilities/TypeList.hpp"
diff --git a/Tests/UnitTests/Core/Utilities/TypeTraitsTest.cpp b/Tests/UnitTests/Core/Utilities/TypeTraitsTest.cpp
index e6d6f6e203e..879eff531a0 100644
--- a/Tests/UnitTests/Core/Utilities/TypeTraitsTest.cpp
+++ b/Tests/UnitTests/Core/Utilities/TypeTraitsTest.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Utilities/TypeTraits.hpp"
diff --git a/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp b/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp
index 3efb365bab4..924e3a76034 100644
--- a/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -24,7 +22,6 @@
 #include <optional>
 #include <utility>
 
-namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
 
 namespace Acts::Test {
diff --git a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp
index a2b9dcef060..43c70dc1923 100644
--- a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp
index 0133fc5ea37..bb13115c4f7 100644
--- a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp b/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp
index 981aed262db..85f1274fe43 100644
--- a/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -45,7 +43,6 @@
 #include <utility>
 #include <vector>
 
-namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
 
 namespace Acts::Test {
diff --git a/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp b/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp
index 86ccc36dbc7..9de0daf696a 100644
--- a/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -27,7 +25,6 @@
 #include <optional>
 #include <utility>
 
-namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
 
 namespace Acts::Test {
diff --git a/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp
index d40b7cb036d..728c07cc53c 100644
--- a/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -38,7 +36,6 @@
 #include <system_error>
 #include <vector>
 
-namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
 using Acts::VectorHelpers::makeVector4;
 
diff --git a/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp
index fd11b9e470c..2cc09ab415c 100644
--- a/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -56,7 +54,6 @@
 
 #include "VertexingDataHelper.hpp"
 
-namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
 
 namespace Acts::Test {
diff --git a/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp b/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp
index ca88b35a147..e40d94c1c1c 100644
--- a/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -44,7 +42,6 @@
 #include <utility>
 #include <vector>
 
-namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
 
 namespace Acts::Test {
diff --git a/Tests/UnitTests/Core/Vertexing/LinearizedTrackFactoryTests.cpp b/Tests/UnitTests/Core/Vertexing/LinearizedTrackFactoryTests.cpp
index 46b762aeca0..f7fe759735d 100644
--- a/Tests/UnitTests/Core/Vertexing/LinearizedTrackFactoryTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/LinearizedTrackFactoryTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -41,7 +39,6 @@
 #include <utility>
 #include <vector>
 
-namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
 
 namespace Acts::Test {
diff --git a/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp
index 94c37e32b1d..5faeaae57c9 100644
--- a/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -41,7 +39,6 @@
 #include <system_error>
 #include <vector>
 
-namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
 using Acts::VectorHelpers::makeVector4;
 
diff --git a/Tests/UnitTests/Core/Vertexing/ZScanVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/ZScanVertexFinderTests.cpp
index b9bca4a9c37..5b4ba624346 100644
--- a/Tests/UnitTests/Core/Vertexing/ZScanVertexFinderTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/ZScanVertexFinderTests.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -46,14 +44,12 @@
 #include <utility>
 #include <vector>
 
-namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
 
 namespace Acts::Test {
 
 using Covariance = BoundSquareMatrix;
 using Propagator = Acts::Propagator<EigenStepper<>>;
-using Linearizer_t = HelicalTrackLinearizer;
 
 // Create a test context
 GeometryContext geoContext = GeometryContext();
diff --git a/Tests/UnitTests/Core/Visualization/EventDataView3DTests.cpp b/Tests/UnitTests/Core/Visualization/EventDataView3DTests.cpp
index d29488a259e..e6f3821e40a 100644
--- a/Tests/UnitTests/Core/Visualization/EventDataView3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/EventDataView3DTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Visualization/ObjVisualization3D.hpp"
diff --git a/Tests/UnitTests/Core/Visualization/PrimitivesView3DTests.cpp b/Tests/UnitTests/Core/Visualization/PrimitivesView3DTests.cpp
index d4d9443ba32..7c4828f6695 100644
--- a/Tests/UnitTests/Core/Visualization/PrimitivesView3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/PrimitivesView3DTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Visualization/SurfaceView3DTests.cpp b/Tests/UnitTests/Core/Visualization/SurfaceView3DTests.cpp
index c6ef185923a..cb1b88be250 100644
--- a/Tests/UnitTests/Core/Visualization/SurfaceView3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/SurfaceView3DTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Visualization/ObjVisualization3D.hpp"
diff --git a/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DTests.cpp b/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DTests.cpp
index cd48cca867a..1fc6e62c210 100644
--- a/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Visualization/ObjVisualization3D.hpp"
diff --git a/Tests/UnitTests/Core/Visualization/Visualization3DTests.cpp b/Tests/UnitTests/Core/Visualization/Visualization3DTests.cpp
index b6d313fe10f..8906c86b547 100644
--- a/Tests/UnitTests/Core/Visualization/Visualization3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/Visualization3DTests.cpp
@@ -20,8 +20,6 @@
 
 #include "Visualization3DTester.hpp"
 
-using boost::test_tools::output_test_stream;
-
 namespace Acts {
 namespace Test {
 
@@ -175,7 +173,7 @@ BOOST_AUTO_TEST_CASE(Visualization3DConstruction) {
 
 BOOST_AUTO_TEST_CASE(PlyOutputTest) {
   PlyVisualization3D ply;
-  output_test_stream output;
+  boost::test_tools::output_test_stream output;
 
   ply.vertex({0, 0, 0});
 
@@ -295,7 +293,7 @@ end_header
 BOOST_AUTO_TEST_CASE(ObjOutputTest) {
   ObjVisualization3D obj;
 
-  output_test_stream output;
+  boost::test_tools::output_test_stream output;
 
   obj.vertex({1, 0, 0});
 
diff --git a/Tests/UnitTests/Core/Visualization/VolumeView3DTests.cpp b/Tests/UnitTests/Core/Visualization/VolumeView3DTests.cpp
index 4130952d742..22217a2e2be 100644
--- a/Tests/UnitTests/Core/Visualization/VolumeView3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/VolumeView3DTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Visualization/ObjVisualization3D.hpp"
diff --git a/Tests/UnitTests/Examples/Algorithms/Alignment/AlignmentGroupingTests.cpp b/Tests/UnitTests/Examples/Algorithms/Alignment/AlignmentGroupingTests.cpp
index 0a759890f30..3c68dc94bf8 100644
--- a/Tests/UnitTests/Examples/Algorithms/Alignment/AlignmentGroupingTests.cpp
+++ b/Tests/UnitTests/Examples/Algorithms/Alignment/AlignmentGroupingTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <ActsExamples/Alignment/AlignmentAlgorithm.hpp>
diff --git a/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceDriftTests.cpp b/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceDriftTests.cpp
index 99a1a251615..70de42ee6c4 100644
--- a/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceDriftTests.cpp
+++ b/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceDriftTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -20,8 +19,6 @@
 #include <array>
 #include <memory>
 
-namespace bdata = boost::unit_test::data;
-
 namespace ActsFatras {
 
 BOOST_AUTO_TEST_SUITE(Digitization)
diff --git a/Tests/UnitTests/Fatras/Selectors/Dataset.hpp b/Tests/UnitTests/Fatras/Selectors/Dataset.hpp
index d38d344497b..f782f8e919e 100644
--- a/Tests/UnitTests/Fatras/Selectors/Dataset.hpp
+++ b/Tests/UnitTests/Fatras/Selectors/Dataset.hpp
@@ -8,8 +8,6 @@
 
 #pragma once
 
-#include <boost/test/data/test_case.hpp>
-
 #include "Acts/Definitions/PdgParticle.hpp"
 #include "Acts/Definitions/Units.hpp"
 #include "ActsFatras/EventData/Particle.hpp"
diff --git a/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp b/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp
index e68c3ab5ab9..3f154dfe424 100644
--- a/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp
+++ b/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp
@@ -6,10 +6,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/old/interface.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/unit_test_suite.hpp>
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/Charge.hpp"
diff --git a/Tests/UnitTests/Plugins/Podio/PodioTrackContainerTest.cpp b/Tests/UnitTests/Plugins/Podio/PodioTrackContainerTest.cpp
index aa7428d4c10..466aec0f1c2 100644
--- a/Tests/UnitTests/Plugins/Podio/PodioTrackContainerTest.cpp
+++ b/Tests/UnitTests/Plugins/Podio/PodioTrackContainerTest.cpp
@@ -6,8 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/old/interface.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/unit_test_suite.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Podio/PodioTrackStateContainerTest.cpp b/Tests/UnitTests/Plugins/Podio/PodioTrackStateContainerTest.cpp
index 47c8ac76ad3..db6abbe5891 100644
--- a/Tests/UnitTests/Plugins/Podio/PodioTrackStateContainerTest.cpp
+++ b/Tests/UnitTests/Plugins/Podio/PodioTrackStateContainerTest.cpp
@@ -7,7 +7,6 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
-#include <boost/test/tools/old/interface.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/unit_test_suite.hpp>
 
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoArb8ConversionTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoArb8ConversionTests.cpp
index 651b19ab316..c632e37347f 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoArb8ConversionTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoArb8ConversionTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoBBoxConversionTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoBBoxConversionTests.cpp
index fcd96763043..f94428ad773 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoBBoxConversionTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoBBoxConversionTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoLayerBuilderTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoLayerBuilderTests.cpp
index ccea59c4323..7adf9b986d0 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoLayerBuilderTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoLayerBuilderTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Units.hpp"
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoMaterialConverterTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoMaterialConverterTests.cpp
index 1231ff493dc..74c5f202624 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoMaterialConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoMaterialConverterTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Units.hpp"
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoParserTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoParserTests.cpp
index 99ae9c2c2d8..b2acbae4871 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoParserTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoParserTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Geometry/GeometryContext.hpp"
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoPrimitivesHelperTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoPrimitivesHelperTests.cpp
index bf895d28eb4..4bc89e36861 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoPrimitivesHelperTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoPrimitivesHelperTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Plugins/TGeo/TGeoPrimitivesHelper.hpp"
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoTrd1ConversionTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoTrd1ConversionTests.cpp
index 4b19a2c55bd..ebdcaf8ddf1 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoTrd1ConversionTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoTrd1ConversionTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoTrd2ConversionTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoTrd2ConversionTests.cpp
index d32b7ec5fe0..cf9bea4acd7 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoTrd2ConversionTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoTrd2ConversionTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoTubeConversionTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoTubeConversionTests.cpp
index 73305cc507d..dd9340de81c 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoTubeConversionTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoTubeConversionTests.cpp
@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"