diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index cc53bc1b549..ac8aece707b 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -65,9 +65,7 @@ if(QT_BUILD_WASM_BATCHED_TESTS)
     add_subdirectory(corelib/io/qdataurl)
     add_subdirectory(corelib/io/qbuffer)
     add_subdirectory(corelib/io/qabstractfileengine)
-    if(NOT WASM) # QTBUG-121822
     add_subdirectory(corelib/io/qsettings)
-    endif()
     add_subdirectory(corelib/io/qstorageinfo)
     add_subdirectory(corelib/io/qstandardpaths)
     add_subdirectory(corelib/io/qfileselector)
diff --git a/tests/auto/corelib/global/CMakeLists.txt b/tests/auto/corelib/global/CMakeLists.txt
index 31c9f7a96de..b017f9ee4de 100644
--- a/tests/auto/corelib/global/CMakeLists.txt
+++ b/tests/auto/corelib/global/CMakeLists.txt
@@ -5,9 +5,7 @@ add_subdirectory(qcheckedint)
 if(NOT INTEGRITY)
     add_subdirectory(qcompare)
 endif()
-if(NOT WASM) # QTBUG-121822
 add_subdirectory(qcomparehelpers)
-endif()
 add_subdirectory(qflags)
 add_subdirectory(q_func_info)
 add_subdirectory(qgetputenv)
diff --git a/tests/auto/corelib/io/CMakeLists.txt b/tests/auto/corelib/io/CMakeLists.txt
index 7067b717155..291dbfb413a 100644
--- a/tests/auto/corelib/io/CMakeLists.txt
+++ b/tests/auto/corelib/io/CMakeLists.txt
@@ -63,9 +63,7 @@ if(QT_FEATURE_processenvironment)
     add_subdirectory(qprocessenvironment)
 endif()
 if(QT_FEATURE_settings AND TARGET Qt::Gui)
-    if(NOT WASM) # QTBUG-121822
     add_subdirectory(qsettings)
-    endif()
 endif()
 if(QT_FEATURE_private_tests)
     add_subdirectory(qzip)
diff --git a/tests/auto/corelib/itemmodels/CMakeLists.txt b/tests/auto/corelib/itemmodels/CMakeLists.txt
index 642c7599c44..99272589adc 100644
--- a/tests/auto/corelib/itemmodels/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/CMakeLists.txt
@@ -6,9 +6,7 @@ add_subdirectory(qgenericitemmodel)
 if(TARGET Qt::Gui)
     add_subdirectory(qabstractitemmodel)
     if(QT_FEATURE_proxymodel)
-        if (NOT WASM) # QTBUG-121822
         add_subdirectory(qabstractproxymodel)
-        endif()
         add_subdirectory(qconcatenatetablesproxymodel)
         add_subdirectory(qidentityproxymodel)
         add_subdirectory(qsortfilterproxymodel_recursive)
diff --git a/tests/auto/corelib/serialization/CMakeLists.txt b/tests/auto/corelib/serialization/CMakeLists.txt
index 96959ec8f01..4d4db102307 100644
--- a/tests/auto/corelib/serialization/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/CMakeLists.txt
@@ -2,19 +2,14 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 add_subdirectory(json)
-if (NOT WASM) # QTBUG-121822
 add_subdirectory(qcborstreamreader)
-endif()
 if(QT_FEATURE_cborstreamwriter)
-    if (NOT WASM) # QTBUG-121822
     add_subdirectory(qcborstreamwriter)
-    endif()
 endif()
-# also (but not only!) QTBUG-121822:
-if(NOT WASM)
-    add_subdirectory(qcborvalue)
+add_subdirectory(qcborvalue)
+if (NOT QT_BUILD_WASM_BATCHED_TESTS)
+	add_subdirectory(qcborvalue_json)
 endif()
-add_subdirectory(qcborvalue_json)
 if(TARGET Qt::Gui)
     add_subdirectory(qdatastream)
     add_subdirectory(qdatastream_core_pixmap)
diff --git a/tests/auto/corelib/text/CMakeLists.txt b/tests/auto/corelib/text/CMakeLists.txt
index 2bb9b89ff80..33460e65939 100644
--- a/tests/auto/corelib/text/CMakeLists.txt
+++ b/tests/auto/corelib/text/CMakeLists.txt
@@ -1,9 +1,7 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-if (NOT WASM) # QTBUG-121822
 add_subdirectory(qanystringview)
-endif()
 add_subdirectory(qbytearray)
 add_subdirectory(qbytearray_large)
 add_subdirectory(qbytearrayapisymmetry)
@@ -15,12 +13,10 @@ add_subdirectory(qchar)
 add_subdirectory(qcollator)
 add_subdirectory(qlatin1stringmatcher)
 add_subdirectory(qlatin1stringview)
-if (NOT WASM) # QTBUG-133219
-add_subdirectory(qlocale)
+if(NOT QT_BUILD_WASM_BATCHED_TESTS)
+    add_subdirectory(qlocale)
 endif()
-if (NOT WASM) # QTBUG-121822
 add_subdirectory(qregularexpression)
-endif()
 add_subdirectory(qstring)
 add_subdirectory(qstring_no_cast_from_bytearray)
 add_subdirectory(qstringapisymmetry)
diff --git a/tests/auto/corelib/tools/CMakeLists.txt b/tests/auto/corelib/tools/CMakeLists.txt
index ddf26f85e1c..2f045c386e7 100644
--- a/tests/auto/corelib/tools/CMakeLists.txt
+++ b/tests/auto/corelib/tools/CMakeLists.txt
@@ -49,9 +49,7 @@ add_subdirectory(qshareddatapointer)
 add_subdirectory(qsharedpointer)
 add_subdirectory(qsize)
 add_subdirectory(qsizef)
-if (NOT WASM) # QTBUG-121822
 add_subdirectory(qspan)
-endif()
 add_subdirectory(qstl)
 add_subdirectory(quniquehandle)
 add_subdirectory(qvarlengtharray)
diff --git a/tests/auto/network/access/CMakeLists.txt b/tests/auto/network/access/CMakeLists.txt
index 13332f02687..ed99aa87460 100644
--- a/tests/auto/network/access/CMakeLists.txt
+++ b/tests/auto/network/access/CMakeLists.txt
@@ -14,9 +14,7 @@ add_subdirectory(qnetworkcachemetadata)
 add_subdirectory(qabstractnetworkcache)
 if(QT_FEATURE_http)
     add_subdirectory(qnetworkreply_local)
-    if(NOT WASM) # QTBUG-121822
     add_subdirectory(qformdatabuilder)
-    endif()
     add_subdirectory(qnetworkrequestfactory)
     add_subdirectory(qrestaccessmanager)
 endif()