diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index 146db9f78..07ba5d4d3 100644
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -101,6 +101,8 @@
 // #cmakedefine QT_NO_DEBUG_STREAM
 // #cmakedefine QT_NO_DIRMODEL
 // #cmakedefine QT_NO_DOCKWIDGET
+// #cmakedefine QT_NO_DOM
+// #cmakedefine QT_NO_ERRORMESSAGE
 
 // Misc
 #cmakedefine QT_NO_USING_NAMESPACE
@@ -114,9 +116,7 @@
 #cmakedefine QT_NO_DEBUG
 #cmakedefine QT_NO_DIAL
 #cmakedefine QT_NO_DIALOGBUTTONBOX
-#cmakedefine QT_NO_DOM
 #cmakedefine QT_NO_EFFECTS
-#cmakedefine QT_NO_ERRORMESSAGE
 #cmakedefine QT_NO_FILEDIALOG
 #cmakedefine QT_NO_FILEICONPROVIDER
 #cmakedefine QT_NO_FILESYSTEMITERATOR
diff --git a/tests/auto/qerrormessage/tst_qerrormessage.cpp b/tests/auto/qerrormessage/tst_qerrormessage.cpp
index ae62da796..0962c326d 100644
--- a/tests/auto/qerrormessage/tst_qerrormessage.cpp
+++ b/tests/auto/qerrormessage/tst_qerrormessage.cpp
@@ -24,6 +24,8 @@
 #include <QDebug>
 #include <QCheckBox>
 
+#ifndef QT_NO_ERRORMESSAGE
+
 class tst_QErrorMessage : public QObject
 {
     Q_OBJECT
@@ -138,3 +140,9 @@ void tst_QErrorMessage::dontShowCategoryAgain()
 QTEST_MAIN(tst_QErrorMessage)
 
 #include "moc_tst_qerrormessage.cpp"
+
+#else // QT_NO_ERRORMESSAGE
+
+QTEST_NOOP_MAIN
+
+#endif // QT_NO_ERRORMESSAGE