diff --git a/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt b/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt
index 142cc80dda3..d7246839fe3 100644
--- a/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt
+++ b/Boolean_set_operations_2/archive/demo/Boolean_set_operations_2_GraphicsView/CMakeLists.txt
@@ -30,9 +30,8 @@ set(CMAKE_AUTOMOC ON)
 
   # The executable itself.
   add_executable  ( boolean_operations_2 ${CMAKE_CURRENT_SOURCE_DIR}/boolean_operations_2.cpp ${CGAL_Qt5_MOC_FILES} ${CDT_UI_FILES} ${CGAL_Qt5_RESOURCE_FILES} )
-  qt5_use_modules(boolean_operations_2 Widgets Script Svg)
   # Link with Qt libraries
-  target_link_libraries( boolean_operations_2 ${QT_LIBRARIES} )
+  target_link_libraries( boolean_operations_2 Qt5::Widgets Qt5::Script Qt5::Svg )
 
   # Link with CGAL
   target_link_libraries( boolean_operations_2 ${CGAL_LIBRARIES}  ${CGAL_3RD_PARTY_LIBRARIES})
diff --git a/Installation/test/Installation/CMakeLists.txt b/Installation/test/Installation/CMakeLists.txt
index c5d6f6c02db..a8e11520ed3 100644
--- a/Installation/test/Installation/CMakeLists.txt
+++ b/Installation/test/Installation/CMakeLists.txt
@@ -73,9 +73,6 @@ if ( CGAL_FOUND )
     find_package(Qt5 QUIET)
     if( Qt5_FOUND )
       create_link_to_program(CGAL_Qt5)
-      if (CGAL_HEADER_ONLY)
-        qt5_use_modules(link_to_CGAL_Qt5)
-      endif()
     endif()
   endif()