diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c174b89a..b83bace53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,8 +127,8 @@ endif()
 if(${PROJECT_NAME}_QT6)
   set(Qt_VERSION_MAJOR 6)
   set(QT_MIN_VERSION "6.0.0")
-  find_package(Qt6Widgets ${QT_MIN_VERSION} REQUIRED)
-  find_package(Qt6Test ${QT_MIN_VERSION} REQUIRED)
+  find_package(Qt6 ${QT_MIN_VERSION} COMPONENTS Widgets REQUIRED)
+  find_package(Qt6 ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Test)
   set(${PROJECT_NAME}_LIBRARY_QTID "-qt6")
 else()
   set(Qt_VERSION_MAJOR 5)