diff --git a/cmake/define_definitions.cmake b/cmake/define_definitions.cmake
index c80cccef8..cd519f9d4 100644
--- a/cmake/define_definitions.cmake
+++ b/cmake/define_definitions.cmake
@@ -68,7 +68,7 @@ else()
   add_definitions(-DBUILD_WITHOUT_KF6)
 endif()
 message("QET_COMPONENTS            :" ${QET_COMPONENTS})
-message("Qt version                :" ${Qt${QT_VERSION_MAJOR}_VERSION})
+message("Qt version                :" ${Qt6_VERSION})
 
 if(QMFILES_AS_RESOURCE)
   add_definitions(-DQMFILES_AS_RESOURCE)
diff --git a/tests/catch/CMakeLists.txt b/tests/catch/CMakeLists.txt
index fb94de374..12b521320 100644
--- a/tests/catch/CMakeLists.txt
+++ b/tests/catch/CMakeLists.txt
@@ -40,23 +40,8 @@ if(NOT DEFINED QET_COMPONENTS)
   message(".. QET_COMPONENTS is not set !!! I set them up !!!")
   include(../../cmake/qet_compilation_vars.cmake)
 endif()
-if(NOT DEFINED QT_VERSION_MAJOR)
-  find_package(
-    QT
-   NAMES
-    Qt6
-   COMPONENTS
-    ${QET_COMPONENTS}
-   REQUIRED
-   )
-endif()
-
-find_package(
-  Qt${QT_VERSION_MAJOR}
- COMPONENTS
- ${QET_COMPONENTS}
- REQUIRED)
- message(".. Qt version                :" ${Qt${QT_VERSION_MAJOR}_VERSION})
+find_package(Qt6 REQUIRED COMPONENTS ${QET_COMPONENTS})
+message(".. Qt version                :" ${Qt6_VERSION})
 
 Include(FetchContent)
 
diff --git a/tests/googlemock/CMakeLists.txt b/tests/googlemock/CMakeLists.txt
index 7f5464729..4badf58b3 100644
--- a/tests/googlemock/CMakeLists.txt
+++ b/tests/googlemock/CMakeLists.txt
@@ -40,23 +40,8 @@ if(NOT DEFINED QET_COMPONENTS)
   message(".. QET_COMPONENTS is not set !!! I set them up !!!")
   include(../../cmake/qet_compilation_vars.cmake)
 endif()
-if(NOT DEFINED QT_VERSION_MAJOR)
-  find_package(
-    QT
-   NAMES
-    Qt6
-   COMPONENTS
-    ${QET_COMPONENTS}
-   REQUIRED
-   )
-endif()
-
-find_package(
-  Qt${QT_VERSION_MAJOR}
- COMPONENTS
- ${QET_COMPONENTS}
- REQUIRED)
-message(".. Qt version                :" ${Qt${QT_VERSION_MAJOR}_VERSION})
+find_package(Qt6 REQUIRED COMPONENTS ${QET_COMPONENTS})
+message(".. Qt version                :" ${Qt6_VERSION})
 
 Include(FetchContent)
 
diff --git a/tests/googletest/CMakeLists.txt b/tests/googletest/CMakeLists.txt
index 7192b0b06..df5a5caa2 100644
--- a/tests/googletest/CMakeLists.txt
+++ b/tests/googletest/CMakeLists.txt
@@ -40,23 +40,8 @@ if(NOT DEFINED QET_COMPONENTS)
   message(".. QET_COMPONENTS is not set !!! I set them up !!!")
   include(../../cmake/qet_compilation_vars.cmake)
 endif()
-if(NOT DEFINED QT_VERSION_MAJOR)
-  find_package(
-    QT
-   NAMES
-    Qt6
-   COMPONENTS
-    ${QET_COMPONENTS}
-   REQUIRED
-   )
-endif()
-
-find_package(
-  Qt${QT_VERSION_MAJOR}
- COMPONENTS
- ${QET_COMPONENTS}
- REQUIRED)
- message(".. Qt version                :" ${Qt${QT_VERSION_MAJOR}_VERSION})
+find_package(Qt6 REQUIRED COMPONENTS ${QET_COMPONENTS})
+message(".. Qt version                :" ${Qt6_VERSION})
 
 Include(FetchContent)
 
diff --git a/tests/qttest/CMakeLists.txt b/tests/qttest/CMakeLists.txt
index 79dec51a9..126e39edf 100644
--- a/tests/qttest/CMakeLists.txt
+++ b/tests/qttest/CMakeLists.txt
@@ -40,25 +40,8 @@ if(NOT DEFINED QET_COMPONENTS)
   message(".. QET_COMPONENTS is not set !!! I set them up !!!")
   include(../../cmake/qet_compilation_vars.cmake)
 endif()
-if(NOT DEFINED QT_VERSION_MAJOR)
-  find_package(
-    QT
-   NAMES
-    Qt6
-   COMPONENTS
-    ${QET_COMPONENTS}
-    Test
-   REQUIRED
-   )
-endif()
-
-find_package(
-  Qt${QT_VERSION_MAJOR}
- COMPONENTS
- ${QET_COMPONENTS}
- Test
- REQUIRED)
- message(".. Qt version                :" ${Qt${QT_VERSION_MAJOR}_VERSION})
+find_package(Qt6 REQUIRED COMPONENTS Test ${QET_COMPONENTS})
+message(".. Qt version                :" ${Qt6_VERSION})
 
 include(../../cmake/fetch_kdeaddons.cmake)
 include(../../cmake/fetch_singleapplication.cmake)