diff --git a/Classification/test/Classification/CMakeLists.txt b/Classification/test/Classification/CMakeLists.txt
index a93e0277355..e9ad1a332dc 100644
--- a/Classification/test/Classification/CMakeLists.txt
+++ b/Classification/test/Classification/CMakeLists.txt
@@ -44,6 +44,7 @@ if (NOT TARGET CGAL::Eigen_support)
 endif()
 
 find_package(TBB QUIET)
+include(CGAL_TBB_support)
 
 if (NOT Classification_dependencies_met)
   return()
diff --git a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt
index 731eab89761..6ea87500e55 100644
--- a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt
+++ b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt
@@ -79,9 +79,10 @@ else()
 endif()
 
 find_package( TBB QUIET )
-if(TBB_FOUND)
+include(CGAL_TBB_support)
+if(TARGET CGAL::TBB_support)
   create_single_source_cgal_program( "parallel_kdtree.cpp" )
-  cgal_target_use_TBB(parallel_kdtree)
+  target_link_libraries(parallel_kdtree PUBLIC CGAL::TBB_support)
 else()
   message(STATUS "parallel_kdtree.cpp requires TBB and will not be compiled")
 endif()