5 files changed, 11 insertions, 4 deletions
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index e4ecfb6f2d..0e42572b03 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -39,6 +39,12 @@
 **
 ****************************************************************************/
 
+#ifdef QT_GUI_LIB
+#  include <QtGui/QGuiApplication>
+#else
+#  include <QtCore/QCoreApplication>
+#endif
+
 #include <QtTest/QtTest>
 
 #include <qtimer.h>
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro
index 0bd988b68c..8f191bd42d 100644
--- a/tests/auto/gui/kernel/kernel.pro
+++ b/tests/auto/gui/kernel/kernel.pro
@@ -7,6 +7,7 @@ SUBDIRS=\
    qfileopenevent \
    qguieventdispatcher \
    qguimetatype \
+   qguitimer \
    qguivariant \
    qinputmethod \
    qkeysequence \
diff --git a/tests/auto/gui/kernel/qguitimer/qguitimer.pro b/tests/auto/gui/kernel/qguitimer/qguitimer.pro
new file mode 100644
index 0000000000..8a71e48007
--- /dev/null
+++ b/tests/auto/gui/kernel/qguitimer/qguitimer.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qguitimer
+QT = core gui testlib
+SOURCES += ../../../corelib/kernel/qtimer/tst_qtimer.cpp
diff --git a/tests/auto/gui/qopengl/qopengl.pro b/tests/auto/gui/qopengl/qopengl.pro
index d0af96df37..ee1b1e39bc 100644
--- a/tests/auto/gui/qopengl/qopengl.pro
+++ b/tests/auto/gui/qopengl/qopengl.pro
@@ -8,5 +8,4 @@ QT += gui gui-private core-private testlib
 
 SOURCES   += tst_qopengl.cpp
 
-mac: CONFIG += insignificant_test # QTBUG-23061
 win32:CONFIG += insignificant_test # QTBUG-24192
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index 91ecbf23a2..90fa2ad716 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -605,8 +605,6 @@ public slots:
 
 void tst_QApplication::quitOnLastWindowClosed()
 {
-#ifndef Q_OS_MAC
-    // Test hangs on Mac OS X, see QTBUG-24319
     {
         int argc = 0;
         QApplication app(argc, 0, QApplication::GuiServer);
@@ -621,7 +619,6 @@ void tst_QApplication::quitOnLastWindowClosed()
         // lastWindowClosed() signal should only be sent after the last dialog is closed
         QCOMPARE(appSpy.count(), 2);
     }
-#endif
     {
         int argc = 0;
         QApplication app(argc, 0, QApplication::GuiServer);