diff --git a/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt
index 893695a495c..2be2f087b35 100644
--- a/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt
+++ b/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt
@@ -5,25 +5,36 @@ cmake_minimum_required(VERSION 3.1...3.23)
 project(Straight_skeleton_2_Tests)
 
 find_package(CGAL REQUIRED COMPONENTS Qt5 Core)
+find_package(LEDA QUIET)
 
 include_directories(BEFORE "include")
 
-# create a target per cppfile
-file(
-  GLOB cppfiles
-  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
-foreach(cppfile ${cppfiles})
-  create_single_source_cgal_program("${cppfile}")
-endforeach()
+create_single_source_cgal_program("issue4533.cpp")
+create_single_source_cgal_program("issue4684.cpp")
+create_single_source_cgal_program("test_sls.cpp")
+create_single_source_cgal_program("test_sls_previous_issues.cpp")
+create_single_source_cgal_program("test_sls_traits.cpp")
+create_single_source_cgal_program("test_straight_skeleton_copy.cpp")
 
 if(CGAL_Qt5_FOUND)
-  target_link_libraries(issue4684 PUBLIC CGAL::CGAL_Basic_viewer)
-  target_link_libraries(issue7149 PUBLIC CGAL::CGAL_Basic_viewer)
-  target_link_libraries(issue7284 PUBLIC CGAL::CGAL_Basic_viewer)
-  target_link_libraries(test_sls_previous_issues PUBLIC CGAL::CGAL_Basic_viewer)
-  target_link_libraries(test_sls_offset PUBLIC CGAL::CGAL_Basic_viewer)
-  target_link_libraries(test_sls_weighted_offset PUBLIC CGAL::CGAL_Basic_viewer)
-  target_link_libraries(test_sls_weighted_polygons PUBLIC CGAL::CGAL_Basic_viewer)
-  target_link_libraries(test_sls_weighted_polygons_with_holes PUBLIC CGAL::CGAL_Basic_viewer)
+  target_link_libraries(issue4684 PRIVATE CGAL::CGAL_Basic_viewer)
+  target_link_libraries(test_sls_previous_issues PRIVATE CGAL::CGAL_Basic_viewer)
 endif()
+
+if (CGAL_Core_FOUND OR LEDA_FOUND)
+  create_single_source_cgal_program("issue7149.cpp")
+  create_single_source_cgal_program("issue7284.cpp")
+  create_single_source_cgal_program("test_sls_offset.cpp")
+  create_single_source_cgal_program("test_sls_weighted_offset.cpp")
+  create_single_source_cgal_program("test_sls_simple.cpp")
+  create_single_source_cgal_program("test_sls_weighted_polygons.cpp")
+  create_single_source_cgal_program("test_sls_weighted_polygons_with_holes.cpp")
+  if(CGAL_Qt5_FOUND)
+    target_link_libraries(issue7149 PRIVATE CGAL::CGAL_Basic_viewer)
+    target_link_libraries(issue7284 PRIVATE CGAL::CGAL_Basic_viewer)
+    target_link_libraries(test_sls_offset PRIVATE CGAL::CGAL_Basic_viewer)
+    target_link_libraries(test_sls_weighted_offset PRIVATE CGAL::CGAL_Basic_viewer)
+    target_link_libraries(test_sls_weighted_polygons PRIVATE CGAL::CGAL_Basic_viewer)
+    target_link_libraries(test_sls_weighted_polygons_with_holes PRIVATE CGAL::CGAL_Basic_viewer)
+  endif()
+endif()
\ No newline at end of file
diff --git a/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/CMakeLists.txt b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/CMakeLists.txt
index f29dcb4e929..fbdf8e26116 100644
--- a/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/CMakeLists.txt
+++ b/Straight_skeleton_extrusion_2/test/Straight_skeleton_extrusion_2/CMakeLists.txt
@@ -5,18 +5,14 @@ cmake_minimum_required(VERSION 3.1...3.23)
 project(Straight_skeleton_extrusion_2_Tests)
 
 find_package(CGAL REQUIRED COMPONENTS Qt5 Core)
+find_package(LEDA QUIET)
 
 include_directories(BEFORE "include")
 
-# create a target per cppfile
-file(
-  GLOB cppfiles
-  RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
-foreach(cppfile ${cppfiles})
-  create_single_source_cgal_program("${cppfile}")
-endforeach()
+if (CGAL_Core_FOUND OR LEDA_FOUND)
+  create_single_source_cgal_program("test_sls_extrude.cpp")
 
-if(CGAL_Qt5_FOUND)
-  target_link_libraries(test_sls_extrude PUBLIC CGAL::CGAL_Basic_viewer)
+  if(CGAL_Qt5_FOUND)
+    target_link_libraries(test_sls_extrude PUBLIC CGAL::CGAL_Basic_viewer)
+  endif()
 endif()