diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 86c55c3a2ad..21af49d7922 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -4,6 +4,29 @@
 # Order by dependency [*], then alphabetic. [*] If bugs in part A of
 # our source would break tests of part B, then test A before B.
 
+set(run_dbus_tests OFF)
+if (QT_FEATURE_dbus)
+    set(run_dbus_tests ON)
+    if(NOT CMAKE_CROSSCOMPILING AND TARGET Qt::DBus)
+        execute_process(COMMAND dbus-send --session --type=signal / local.AutotestCheck.Hello
+            TIMEOUT 5
+            RESULT_VARIABLE dbus_session_test
+            OUTPUT_QUIET ERROR_QUIET)
+        if(NOT "${dbus_session_test}" STREQUAL "0")
+            set(run_dbus_tests OFF)
+            if(QT_FEATURE_dbus_linked)
+                message(WARNING
+                    " QtDBus is enabled but session bus is not available for testing.\n"
+                    " Please check the installation. Skipping QtDBus tests.")
+            else()
+                message(WARNING
+                    " QtDBus is enabled with runtime support, but session bus is not available.\n"
+                    " Skipping QtDBus tests.")
+            endif()
+        endif()
+    endif()
+endif()
+
 if(UIKIT)
     # For now, only build CMake auto tests when QT_BUILD_MINIMAL_STATIC_TEST
     # is a requested (which is basically what CI will build).
@@ -58,29 +81,8 @@ if (TARGET Qt::Concurrent)
      add_subdirectory(concurrent)
 endif()
 
-if (QT_FEATURE_dbus)
-    set(run_dbus_tests ON)
-    if(NOT CMAKE_CROSSCOMPILING AND TARGET Qt::DBus)
-        execute_process(COMMAND dbus-send --session --type=signal / local.AutotestCheck.Hello
-            TIMEOUT 5
-            RESULT_VARIABLE dbus_session_test
-            OUTPUT_QUIET ERROR_QUIET)
-        if(NOT "${dbus_session_test}" STREQUAL "0")
-            set(run_dbus_tests OFF)
-            if(QT_FEATURE_dbus_linked)
-                message(WARNING
-                    " QtDBus is enabled but session bus is not available for testing.\n"
-                    " Please check the installation. Skipping QtDBus tests.")
-            else()
-                message(WARNING
-                    " QtDBus is enabled with runtime support, but session bus is not available.\n"
-                    " Skipping QtDBus tests.")
-            endif()
-        endif()
-    endif()
-    if(run_dbus_tests)
-        add_subdirectory(dbus)
-    endif()
+if(run_dbus_tests)
+    add_subdirectory(dbus)
 endif()
 
 if (TARGET Qt::Gui)
diff --git a/tests/auto/tools/CMakeLists.txt b/tests/auto/tools/CMakeLists.txt
index df3498bcfe7..ffeb228cf34 100644
--- a/tests/auto/tools/CMakeLists.txt
+++ b/tests/auto/tools/CMakeLists.txt
@@ -15,7 +15,7 @@ endif()
 if(TARGET Qt::Widgets AND NOT ANDROID AND NOT IOS)
     add_subdirectory(uic)
 endif()
-if(TARGET Qt::DBus)
+if(run_dbus_tests)
     add_subdirectory(qdbuscpp2xml)
     add_subdirectory(qdbusxml2cpp)
 endif()