diff --git a/tests/auto/platformsocketengine/platformsocketengine.pro b/tests/auto/platformsocketengine/platformsocketengine.pro
index faf745c6796..99ae358a939 100644
--- a/tests/auto/platformsocketengine/platformsocketengine.pro
+++ b/tests/auto/platformsocketengine/platformsocketengine.pro
@@ -7,7 +7,7 @@ requires(contains(QT_CONFIG,private_tests))
 
 MOC_DIR=tmp
 
-QT = core network
+QT = core-private network-private
 
 symbian {
     TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qauthenticator/qauthenticator.pro b/tests/auto/qauthenticator/qauthenticator.pro
index 05f83bc166c..8ddb13b0dfe 100644
--- a/tests/auto/qauthenticator/qauthenticator.pro
+++ b/tests/auto/qauthenticator/qauthenticator.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
 requires(contains(QT_CONFIG,private_tests))
-QT = core network
+QT = core network-private
 SOURCES  += tst_qauthenticator.cpp
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/qcolumnview/qcolumnview.pro b/tests/auto/qcolumnview/qcolumnview.pro
index 754f06fd498..e36df030c23 100644
--- a/tests/auto/qcolumnview/qcolumnview.pro
+++ b/tests/auto/qcolumnview/qcolumnview.pro
@@ -1,4 +1,5 @@
 CONFIG += qttest_p4
+QT += gui-private core-private
 
 SOURCES		+= tst_qcolumnview.cpp 
 TARGET		= tst_qcolumnview
diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/qcombobox/qcombobox.pro
index 2ac5c7c53b6..a8f0e6ad23c 100644
--- a/tests/auto/qcombobox/qcombobox.pro
+++ b/tests/auto/qcombobox/qcombobox.pro
@@ -1,3 +1,4 @@
 load(qttest_p4)
+QT += gui-private core-private
 SOURCES  += tst_qcombobox.cpp
 
diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro
index f696f195de3..16fa2652316 100644
--- a/tests/auto/qcssparser/qcssparser.pro
+++ b/tests/auto/qcssparser/qcssparser.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 SOURCES += tst_qcssparser.cpp
-QT += xml
+QT += xml gui-private
 
 requires(contains(QT_CONFIG,private_tests))
 !symbian: {
diff --git a/tests/auto/qdbusmarshall/test/test.pro b/tests/auto/qdbusmarshall/test/test.pro
index 71fc6563c13..ba4d99b57d4 100644
--- a/tests/auto/qdbusmarshall/test/test.pro
+++ b/tests/auto/qdbusmarshall/test/test.pro
@@ -3,7 +3,7 @@ SOURCES += ../tst_qdbusmarshall.cpp
 TARGET = ../tst_qdbusmarshall
 
 QT = core
-QT += dbus
+QT += core-private dbus-private
 
 LIBS += $$QT_LIBS_DBUS
 QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
diff --git a/tests/auto/qfiledialog/qfiledialog.pro b/tests/auto/qfiledialog/qfiledialog.pro
index 68f2e3c1466..57828b1bd47 100644
--- a/tests/auto/qfiledialog/qfiledialog.pro
+++ b/tests/auto/qfiledialog/qfiledialog.pro
@@ -4,6 +4,7 @@
 
 load(qttest_p4)
 
+QT += core-private gui-private
 SOURCES += tst_qfiledialog.cpp
 
 wince*|symbian {
diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro
index 6f01f6705f2..2fd626a57ec 100644
--- a/tests/auto/qfileinfo/qfileinfo.pro
+++ b/tests/auto/qfileinfo/qfileinfo.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qfileinfo.cpp
 
-QT = core
+QT = core-private
 
 
 RESOURCES      += qfileinfo.qrc
diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
index 04cea4805c1..ab121306e31 100644
--- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
+++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
@@ -1,6 +1,6 @@
 CONFIG += qttest_p4
 
-QT = core gui
+QT = core-private gui
 
 SOURCES		+= tst_qfilesystemmodel.cpp
 TARGET		= tst_qfilesystemmodel
diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro
index 20f8018f4cd..74d9803d2fb 100644
--- a/tests/auto/qgl/qgl.pro
+++ b/tests/auto/qgl/qgl.pro
@@ -4,7 +4,7 @@
 
 load(qttest_p4)
 requires(contains(QT_CONFIG,opengl))
-QT += opengl
+QT += opengl-private gui-private core-private
 
 contains(QT_CONFIG,egl):DEFINES += QGL_EGL
 win32:!wince*: DEFINES += QT_NO_EGL
diff --git a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
index 87684258ed2..e1829b0b6b2 100644
--- a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
+++ b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
@@ -1,3 +1,4 @@
 load(qttest_p4)
+QT += core-private gui-private
 SOURCES  += tst_qgraphicsanchorlayout.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro
index 90b78783d9d..535de0c07e4 100644
--- a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro
+++ b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro
@@ -1,3 +1,4 @@
 load(qttest_p4)
+QT += core-private gui-private
 SOURCES += tst_qgraphicsanchorlayout1.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/qgraphicsitem/qgraphicsitem.pro b/tests/auto/qgraphicsitem/qgraphicsitem.pro
index 20acf35b33f..ed30cae759e 100644
--- a/tests/auto/qgraphicsitem/qgraphicsitem.pro
+++ b/tests/auto/qgraphicsitem/qgraphicsitem.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += core-private gui-private
 SOURCES  += tst_qgraphicsitem.cpp
 DEFINES += QT_NO_CAST_TO_ASCII
 
diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/qgraphicsscene/qgraphicsscene.pro
index 82fa423e668..635fb9b4e60 100644
--- a/tests/auto/qgraphicsscene/qgraphicsscene.pro
+++ b/tests/auto/qgraphicsscene/qgraphicsscene.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += core-private gui-private
 SOURCES  += tst_qgraphicsscene.cpp
 RESOURCES += images.qrc
 win32:!wince*: LIBS += -lUser32
diff --git a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro
index 1fdd176b3ba..0d0fd0db1a4 100644
--- a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro
+++ b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
 requires(contains(QT_CONFIG,private_tests))
+QT += core-private gui-private
 SOURCES  += tst_qgraphicssceneindex.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/qhostinfo/qhostinfo.pro b/tests/auto/qhostinfo/qhostinfo.pro
index 97197a9b955..77ce1867d10 100644
--- a/tests/auto/qhostinfo/qhostinfo.pro
+++ b/tests/auto/qhostinfo/qhostinfo.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 
 SOURCES  += tst_qhostinfo.cpp
 
-QT = core network
+QT = core-private network-private
 
 wince*: {
   LIBS += ws2.lib
diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
index 223c4e1c967..98511ac86e5 100644
--- a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
+++ b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
@@ -3,7 +3,7 @@ SOURCES  += tst_qhttpnetworkconnection.cpp
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
 requires(contains(QT_CONFIG,private_tests))
 
-QT = core network
+QT = core-private network-private
 
 symbian: TARGET.CAPABILITY = NetworkServices
 symbian: {
diff --git a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
index 36d56c6f202..8ce9f6f7609 100644
--- a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
+++ b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
@@ -3,5 +3,5 @@ SOURCES  += tst_qhttpnetworkreply.cpp
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib
 requires(contains(QT_CONFIG,private_tests))
 
-QT = core network
+QT = core-private network-private
 symbian: TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/qhttpsocketengine/qhttpsocketengine.pro
index 6df619200b9..f26abbe8d97 100644
--- a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro
+++ b/tests/auto/qhttpsocketengine/qhttpsocketengine.pro
@@ -6,7 +6,7 @@ include(../platformsocketengine/platformsocketengine.pri)
 
 MOC_DIR=tmp
 
-QT = core network
+QT = core-private network-private
 
 symbian: TARGET.CAPABILITY = NetworkServices
 
diff --git a/tests/auto/qlistwidget/qlistwidget.pro b/tests/auto/qlistwidget/qlistwidget.pro
index faf970d027a..eb4c335b5bb 100644
--- a/tests/auto/qlistwidget/qlistwidget.pro
+++ b/tests/auto/qlistwidget/qlistwidget.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += core-private gui-private
 SOURCES  += tst_qlistwidget.cpp
 
 
diff --git a/tests/auto/qmainwindow/qmainwindow.pro b/tests/auto/qmainwindow/qmainwindow.pro
index e015f95ec17..0f6d71c6ecf 100644
--- a/tests/auto/qmainwindow/qmainwindow.pro
+++ b/tests/auto/qmainwindow/qmainwindow.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 SOURCES += tst_qmainwindow.cpp
-
+QT += gui-private
 # Symbian toolchain does not support correct include semantics
 symbian:INCPATH+=..\\..\\..\\include\\QtGui\\private
 
diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro
index d1f6707f6f5..d415e04451c 100644
--- a/tests/auto/qnetworkreply/test/test.pro
+++ b/tests/auto/qnetworkreply/test/test.pro
@@ -13,7 +13,7 @@ win32 {
 
 !symbian:DEFINES += SRCDIR=\\\"$$PWD/..\\\"
 
-QT = core network
+QT = core-private network-private
 RESOURCES += ../qnetworkreply.qrc
 
 symbian|wince*:{
diff --git a/tests/auto/qobject/tst_qobject.pro b/tests/auto/qobject/tst_qobject.pro
index e31fed5d107..29de071328f 100644
--- a/tests/auto/qobject/tst_qobject.pro
+++ b/tests/auto/qobject/tst_qobject.pro
@@ -7,7 +7,8 @@ SOURCES += moc_oldnormalizeobject.cpp
 
 QT = core \
     network \
-    gui
+    gui \
+    core-private
 wince*: { 
     addFiles.files = signalbug.exe
     addFiles.path = .
diff --git a/tests/auto/qpathclipper/qpathclipper.pro b/tests/auto/qpathclipper/qpathclipper.pro
index 590fba0e2d1..2becd7dd039 100644
--- a/tests/auto/qpathclipper/qpathclipper.pro
+++ b/tests/auto/qpathclipper/qpathclipper.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 INCLUDEPATH += .
 HEADERS += paths.h
 SOURCES  += tst_qpathclipper.cpp paths.cpp
+QT += gui-private
 
 requires(contains(QT_CONFIG,private_tests))
 
diff --git a/tests/auto/qpixmapcache/qpixmapcache.pro b/tests/auto/qpixmapcache/qpixmapcache.pro
index c31f0395482..1ffafd6c252 100644
--- a/tests/auto/qpixmapcache/qpixmapcache.pro
+++ b/tests/auto/qpixmapcache/qpixmapcache.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += gui-private
 SOURCES  += tst_qpixmapcache.cpp
 
 
diff --git a/tests/auto/qsidebar/qsidebar.pro b/tests/auto/qsidebar/qsidebar.pro
index 91a2137f2c8..3ace4fe8a52 100644
--- a/tests/auto/qsidebar/qsidebar.pro
+++ b/tests/auto/qsidebar/qsidebar.pro
@@ -1,5 +1,6 @@
 CONFIG += qttest_p4
 
+QT += core-private
 SOURCES		+= tst_qsidebar.cpp 
 TARGET		= tst_qsidebar
 
diff --git a/tests/auto/qsocketnotifier/qsocketnotifier.pro b/tests/auto/qsocketnotifier/qsocketnotifier.pro
index 27484c89f71..c0fdc6a9b3d 100644
--- a/tests/auto/qsocketnotifier/qsocketnotifier.pro
+++ b/tests/auto/qsocketnotifier/qsocketnotifier.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 SOURCES += tst_qsocketnotifier.cpp
-QT = core network
+QT = core-private network-private
 
 requires(contains(QT_CONFIG,private_tests))
 
diff --git a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
index f966e7fec0d..2537a6cc26b 100644
--- a/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
+++ b/tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp
@@ -57,7 +57,7 @@
 #include <private/qnet_unix_p.h>
 #endif
 #include <limits>
-#include <select.h>
+#include <sys/select.h>
 
 class tst_QSocketNotifier : public QObject
 {
@@ -180,7 +180,7 @@ void tst_QSocketNotifier::unexpectedDisconnection()
         // we have to wait until sequence value changes
         // as any event can make us jump out processing
         QCoreApplication::processEvents(QEventLoop::WaitForMoreEvents);
-        QVERIFY(timer.isActive); //escape if test would hang
+        QVERIFY(timer.isActive()); //escape if test would hang
     }  while(tester.sequence <= 0);
 
     QVERIFY(readEnd1.state() == QAbstractSocket::ConnectedState);
diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
index c82c62d3e88..3a144aeacf3 100644
--- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
+++ b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
@@ -7,7 +7,7 @@ include(../platformsocketengine/platformsocketengine.pri)
 
 MOC_DIR=tmp
 
-QT = core network
+QT = core-private network-private
 
 # Symbian toolchain does not support correct include semantics
 symbian:INCLUDEPATH+=..\\..\\..\\include\\QtNetwork\\private
diff --git a/tests/auto/qsslsocket/qsslsocket.pro b/tests/auto/qsslsocket/qsslsocket.pro
index 77517e05bc1..76d73b7cb38 100644
--- a/tests/auto/qsslsocket/qsslsocket.pro
+++ b/tests/auto/qsslsocket/qsslsocket.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 
 SOURCES += tst_qsslsocket.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += network
+QT += core-private network-private
 QT -= gui
 
 TARGET = tst_qsslsocket
diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
index 53020eb8920..42373b03241 100644
--- a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
+++ b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 
 SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += network
+QT += core-private network-private
 QT -= gui
 
 TARGET = tst_qsslsocket_onDemandCertificates_member
diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
index 3452a92fe2c..3a06ec190cc 100644
--- a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
+++ b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
@@ -2,7 +2,7 @@ load(qttest_p4)
 
 SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp
 !wince*:win32:LIBS += -lws2_32
-QT += network
+QT += core-private network-private
 QT -= gui
 
 TARGET = tst_qsslsocket_onDemandCertificates_static
diff --git a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
index eada969d965..1575616b19b 100644
--- a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
+++ b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-
+QT += gui-private
 # Input
 SOURCES += tst_qstylesheetstyle.cpp
 RESOURCES += resources.qrc
diff --git a/tests/auto/qtcpsocket/test/test.pro b/tests/auto/qtcpsocket/test/test.pro
index 7bf5ba00744..e282de1a2e8 100644
--- a/tests/auto/qtcpsocket/test/test.pro
+++ b/tests/auto/qtcpsocket/test/test.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += core-private network-private
 SOURCES += ../tst_qtcpsocket.cpp
 win32: {
 wince*: {
diff --git a/tests/auto/qtextedit/qtextedit.pro b/tests/auto/qtextedit/qtextedit.pro
index cef2b300d76..58517633100 100644
--- a/tests/auto/qtextedit/qtextedit.pro
+++ b/tests/auto/qtextedit/qtextedit.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += gui-private
 INCLUDEPATH += ../
 
 HEADERS +=  
diff --git a/tests/auto/qtextlayout/qtextlayout.pro b/tests/auto/qtextlayout/qtextlayout.pro
index 381f09e5e99..2a180d79377 100644
--- a/tests/auto/qtextlayout/qtextlayout.pro
+++ b/tests/auto/qtextlayout/qtextlayout.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += core-private gui-private
 HEADERS += 
 SOURCES += tst_qtextlayout.cpp 
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
diff --git a/tests/auto/qtextpiecetable/qtextpiecetable.pro b/tests/auto/qtextpiecetable/qtextpiecetable.pro
index 0926b83ccc7..edcb0a091c6 100644
--- a/tests/auto/qtextpiecetable/qtextpiecetable.pro
+++ b/tests/auto/qtextpiecetable/qtextpiecetable.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += core-private gui-private
 SOURCES  += tst_qtextpiecetable.cpp
 HEADERS += ../qtextdocument/common.h
 
diff --git a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
index e232443a35e..e3d99bb85cc 100644
--- a/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
+++ b/tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro
@@ -1,5 +1,5 @@
 CONFIG += qttest_p4
-#QT = core
+QT += gui-private
 
 include(../src/src.pri)
 win32: CONFIG += console
diff --git a/tests/auto/qtipc/qsharedmemory/src/src.pri b/tests/auto/qtipc/qsharedmemory/src/src.pri
index 5bc9de62db3..8aaf528447f 100644
--- a/tests/auto/qtipc/qsharedmemory/src/src.pri
+++ b/tests/auto/qtipc/qsharedmemory/src/src.pri
@@ -1,5 +1,6 @@
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
+QT += core-private
 
 SOURCES += $$PWD/qsystemlock.cpp
 
diff --git a/tests/auto/qtoolbar/qtoolbar.pro b/tests/auto/qtoolbar/qtoolbar.pro
index 4f2c8f1e1fe..2c1176fe004 100644
--- a/tests/auto/qtoolbar/qtoolbar.pro
+++ b/tests/auto/qtoolbar/qtoolbar.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += gui-private
 SOURCES += tst_qtoolbar.cpp