5 files changed, 26 insertions, 4 deletions
diff --git a/tests/auto/corelib/thread/.prev_CMakeLists.txt b/tests/auto/corelib/thread/.prev_CMakeLists.txt
index b73d9af059..15e7939445 100644
--- a/tests/auto/corelib/thread/.prev_CMakeLists.txt
+++ b/tests/auto/corelib/thread/.prev_CMakeLists.txt
@@ -15,11 +15,13 @@ if(QT_FEATURE_thread)
     add_subdirectory(qthread)
     add_subdirectory(qthreadonce)
     add_subdirectory(qthreadpool)
-    add_subdirectory(qthreadstorage)
     add_subdirectory(qwaitcondition)
     add_subdirectory(qwritelocker)
     add_subdirectory(qpromise)
 endif()
-if(TARGET Qt::Concurrent)
+if(QT_FEATURE_thread AND NOT ANDROID)
+    add_subdirectory(qthreadstorage)
+endif()
+if(TARGET Qt::Concurrent AND NOT ANDROID)
     add_subdirectory(qfuturewatcher)
 endif()
diff --git a/tests/auto/corelib/thread/CMakeLists.txt b/tests/auto/corelib/thread/CMakeLists.txt
index 8c3e33d6dc..931d8f0c6a 100644
--- a/tests/auto/corelib/thread/CMakeLists.txt
+++ b/tests/auto/corelib/thread/CMakeLists.txt
@@ -20,11 +20,19 @@ if(QT_FEATURE_thread)
     # special case end
     add_subdirectory(qthreadonce)
     add_subdirectory(qthreadpool)
-    add_subdirectory(qthreadstorage)
+    # special case begin
+    # QTBUG-87431
+    if(NOT ANDROID)
+        add_subdirectory(qthreadstorage)
+    endif()
+    # special case end
     add_subdirectory(qwaitcondition)
     add_subdirectory(qwritelocker)
     add_subdirectory(qpromise)
 endif()
-if(TARGET Qt::Concurrent)
+# special case begin
+# QTBUG-87431
+if(TARGET Qt::Concurrent AND NOT ANDROID)
     add_subdirectory(qfuturewatcher)
 endif()
+# special case end
diff --git a/tests/auto/corelib/thread/qatomicint/BLACKLIST b/tests/auto/corelib/thread/qatomicint/BLACKLIST
new file mode 100644
index 0000000000..406fb7cc1c
--- /dev/null
+++ b/tests/auto/corelib/thread/qatomicint/BLACKLIST
@@ -0,0 +1,3 @@
+# QTBUG-87422
+[alignment]
+android
diff --git a/tests/auto/corelib/thread/qthreadstorage/BLACKLIST b/tests/auto/corelib/thread/qthreadstorage/BLACKLIST
new file mode 100644
index 0000000000..84906ff86e
--- /dev/null
+++ b/tests/auto/corelib/thread/qthreadstorage/BLACKLIST
@@ -0,0 +1,3 @@
+# QTBUG-87431
+[crashOnExit]
+android
diff --git a/tests/auto/corelib/thread/thread.pro b/tests/auto/corelib/thread/thread.pro
index 510614ef66..d6e24b9b33 100644
--- a/tests/auto/corelib/thread/thread.pro
+++ b/tests/auto/corelib/thread/thread.pro
@@ -26,3 +26,9 @@ qtHaveModule(concurrent) {
     SUBDIRS += \
         qfuturewatcher
 }
+
+android: SUBDIRS -= \
+    # QTBUG-87431
+    qthreadstorage \
+    # QTBUG-88136
+    qfuturewatcher