diff --git a/src/core/global/qconfig.h.cmake b/src/core/global/qconfig.h.cmake
index cd0485e5e..c21ebd181 100644
--- a/src/core/global/qconfig.h.cmake
+++ b/src/core/global/qconfig.h.cmake
@@ -96,6 +96,9 @@
 // #cmakedefine QT_NO_COMPLETER
 // #cmakedefine QT_NO_CONTEXTMENU
 // #cmakedefine QT_NO_CSSPARSER
+// #cmakedefine QT_NO_DATESTRING
+// #cmakedefine QT_NO_DATETIMEEDIT
+// #cmakedefine QT_NO_DEBUG_STREAM
 
 // Misc
 #cmakedefine QT_NO_USING_NAMESPACE
@@ -106,11 +109,7 @@
 #cmakedefine QT_NO_CONCURRENT
 #cmakedefine QT_NO_CURSOR
 #cmakedefine QT_NO_DATAWIDGETMAPPER
-#cmakedefine QT_NO_DATESTRING
-#cmakedefine QT_NO_DATETIMEEDIT
 #cmakedefine QT_NO_DEBUG
-#cmakedefine QT_NO_DEBUG_PLUGIN_CHECK
-#cmakedefine QT_NO_DEBUG_STREAM
 #cmakedefine QT_NO_DIAL
 #cmakedefine QT_NO_DIALOGBUTTONBOX
 #cmakedefine QT_NO_DIRMODEL
diff --git a/tests/auto/qboxlayout/tst_qboxlayout.cpp b/tests/auto/qboxlayout/tst_qboxlayout.cpp
index 078102c1c..c950bce7d 100644
--- a/tests/auto/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/qboxlayout/tst_qboxlayout.cpp
@@ -198,6 +198,9 @@ void tst_QBoxLayout::sizeConstraints()
 
 void tst_QBoxLayout::setGeometry()
 {
+#ifdef QT_NO_DIAL
+    QSKIP("Katie compiled without dial support (QT_NO_DIAL)", SkipAll);
+#else
     QWidget toplevel;
     QWidget w(&toplevel);
     QVBoxLayout *lay = new QVBoxLayout;
@@ -215,6 +218,7 @@ void tst_QBoxLayout::setGeometry()
     QRect newGeom(0, 0, 70, 70);
     lay2->setGeometry(newGeom);
     QVERIFY2(newGeom.contains(dial->geometry()), "dial->geometry() should be smaller and within newGeom");
+#endif // QT_NO_DIAL
 }
 
 void tst_QBoxLayout::setStyleShouldChangeSpacing()
diff --git a/tests/auto/qdial/tst_qdial.cpp b/tests/auto/qdial/tst_qdial.cpp
index 06826a327..5305274fc 100644
--- a/tests/auto/qdial/tst_qdial.cpp
+++ b/tests/auto/qdial/tst_qdial.cpp
@@ -24,6 +24,8 @@
 
 #include <QDial>
 
+#ifndef QT_NO_DIAL
+
 class tst_QDial : public QObject
 {
     Q_OBJECT
@@ -190,3 +192,9 @@ void tst_QDial::wrappingCheck()
 QTEST_MAIN(tst_QDial)
 
 #include "moc_tst_qdial.cpp"
+
+#else
+
+QTEST_NOOP_MAIN
+
+#endif // QT_NO_DIAL
diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp
index 4c0c5f987..04ab8bbf8 100644
--- a/tests/auto/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp
@@ -1824,7 +1824,7 @@ class MainWindow : public QMainWindow {
 void tst_QMainWindow::setCursor()
 {
 #ifdef QT_NO_CURSOR
-    QSKIP("Qt compiled without cursor support(QT_NO_CURSOR)", SkipAll);
+    QSKIP("Katie compiled without cursor support (QT_NO_CURSOR)", SkipAll);
 #else
     MainWindow mw;
     QCursor cur = Qt::WaitCursor;