diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 15a7cf569382454d1987ebad893726d42d2ea89f..0e8a379c31ac442eaa787afde31d8290318eb915 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -15,7 +15,7 @@ SUBDIRS=\
 installed_cmake.depends = cmake
 
 # These tests don't make sense for cross-compiled builds
-cross_compile:SUBDIRS -= linguist
+cross_compile:SUBDIRS -= linguist qtdiag
 
 # These tests need the QtHelp module
 !qtHaveModule(help): SUBDIRS -= \
@@ -26,5 +26,4 @@ cross_compile:SUBDIRS -= linguist
     qhelpprojectdata \
 
 !qtConfig(process): SUBDIRS -= qtattributionsscanner linguist qtdiag windeployqt
-android|qnx: SUBDIRS -= qtdiag
 !win32|winrt: SUBDIRS -= windeployqt