diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d22c81f2f..6cbfd5432 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -18,6 +18,8 @@ if (APPLE)
     target_link_libraries(test_common INTERFACE "-liconv -framework IOKit" "-framework CoreFoundation" -lc++)
 endif()
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 add_subdirectory(libnest2d)
 add_subdirectory(timeutils)
 add_subdirectory(sla_print)
diff --git a/tests/example/CMakeLists.txt b/tests/example/CMakeLists.txt
index 45e4bb28e..d62f0a96c 100644
--- a/tests/example/CMakeLists.txt
+++ b/tests/example/CMakeLists.txt
@@ -4,4 +4,5 @@ target_link_libraries(${_TEST_NAME}_tests test_common libslic3r
 #${Boost_LIBRARIES} ${TBB_LIBRARIES} ${Boost_LIBRARIES}
 )
 
-catch_discover_tests(${_TEST_NAME}_tests TEST_PREFIX "${_TEST_NAME}: ")
+# catch_discover_tests(${_TEST_NAME}_tests TEST_PREFIX "${_TEST_NAME}: ")
+add_test(${_TEST_NAME}_tests ${_TEST_NAME}_tests "--durations yes")
\ No newline at end of file
diff --git a/tests/libnest2d/CMakeLists.txt b/tests/libnest2d/CMakeLists.txt
index 6b2cbd194..91a2e7852 100644
--- a/tests/libnest2d/CMakeLists.txt
+++ b/tests/libnest2d/CMakeLists.txt
@@ -1,6 +1,7 @@
 get_filename_component(_TEST_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
 add_executable(${_TEST_NAME}_tests ${_TEST_NAME}_tests_main.cpp printer_parts.cpp printer_parts.hpp)
 target_link_libraries(${_TEST_NAME}_tests test_common libnest2d )
+set_property(TARGET ${_TEST_NAME}_tests PROPERTY FOLDER "tests")
 
 # catch_discover_tests(${_TEST_NAME}_tests TEST_PREFIX "${_TEST_NAME}: ")
 add_test(${_TEST_NAME}_tests ${_TEST_NAME}_tests "--durations yes")
diff --git a/tests/libnest2d/libnest2d_tests_main.cpp b/tests/libnest2d/libnest2d_tests_main.cpp
index 4eecb7e58..252bea47f 100644
--- a/tests/libnest2d/libnest2d_tests_main.cpp
+++ b/tests/libnest2d/libnest2d_tests_main.cpp
@@ -3,6 +3,7 @@
 
 #include <fstream>
 
+
 #include <libnest2d/libnest2d.hpp>
 #include "printer_parts.hpp"
 //#include <libnest2d/geometry_traits_nfp.hpp>
@@ -371,7 +372,7 @@ TEST_CASE("ArrangeRectanglesTight", "[Nesting]")
     REQUIRE(getX(bin.center()) == 105);
     REQUIRE(getY(bin.center()) == 125);
 
-    _Nester<BottomLeftPlacer, DJDHeuristic> arrange(bin);
+    _Nester<BottomLeftPlacer, FirstFitSelection> arrange(bin);
 
     arrange.execute(rects.begin(), rects.end());
 
@@ -439,7 +440,7 @@ TEST_CASE("ArrangeRectanglesLoose", "[Nesting]")
 
     Coord min_obj_distance = 5;
 
-    _Nester<BottomLeftPlacer, DJDHeuristic> arrange(bin, min_obj_distance);
+    _Nester<BottomLeftPlacer, FirstFitSelection> arrange(bin, min_obj_distance);
 
     arrange.execute(rects.begin(), rects.end());
 
diff --git a/tests/sla_print/CMakeLists.txt b/tests/sla_print/CMakeLists.txt
index 077654273..d0b51a01d 100644
--- a/tests/sla_print/CMakeLists.txt
+++ b/tests/sla_print/CMakeLists.txt
@@ -1,6 +1,7 @@
 get_filename_component(_TEST_NAME ${CMAKE_CURRENT_LIST_DIR} NAME)
 add_executable(${_TEST_NAME}_tests ${_TEST_NAME}_tests.cpp)
 target_link_libraries(${_TEST_NAME}_tests test_common libslic3r)
+set_property(TARGET ${_TEST_NAME}_tests PROPERTY FOLDER "tests")
 
-#catch_discover_tests(${_TEST_NAME}_tests TEST_PREFIX "${_TEST_NAME}: ")
+# catch_discover_tests(${_TEST_NAME}_tests TEST_PREFIX "${_TEST_NAME}: ")
 add_test(${_TEST_NAME}_tests ${_TEST_NAME}_tests "--durations yes")
diff --git a/tests/timeutils/CMakeLists.txt b/tests/timeutils/CMakeLists.txt
index 8dce85801..b67ce85f1 100644
--- a/tests/timeutils/CMakeLists.txt
+++ b/tests/timeutils/CMakeLists.txt
@@ -5,6 +5,7 @@ add_executable(${_TEST_NAME}_tests
     ${PROJECT_SOURCE_DIR}/src/libslic3r/Time.hpp
     )
 target_link_libraries(${_TEST_NAME}_tests test_common)
+set_property(TARGET ${_TEST_NAME}_tests PROPERTY FOLDER "tests")
 
 # catch_discover_tests(${_TEST_NAME}_tests TEST_PREFIX "${_TEST_NAME}: ")
 add_test(${_TEST_NAME}_tests ${_TEST_NAME}_tests "--durations yes")