diff --git a/src/testlib/qasciikey.cpp b/src/testlib/qasciikey.cpp
index 80e94acd0b3..bcbbddff63f 100644
--- a/src/testlib/qasciikey.cpp
+++ b/src/testlib/qasciikey.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "QtTest/qtestcase.h"
-#include "QtTest/qtestassert.h"
+#include <QtTest/qtestcase.h>
+#include <QtTest/qtestassert.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp
index 02b3566f012..ae15ef259ed 100644
--- a/src/testlib/qbenchmark.cpp
+++ b/src/testlib/qbenchmark.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "QtTest/qbenchmark.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
+#include <QtTest/qbenchmark.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
 
 #include <QtCore/qprocess.h>
 #include <QtCore/qdir.h>
diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h
index 36e4b354934..38f34c416b4 100644
--- a/src/testlib/qbenchmark_p.h
+++ b/src/testlib/qbenchmark_p.h
@@ -63,14 +63,14 @@
 #undef QTESTLIB_USE_VALGRIND
 #endif
 
-#include "QtTest/private/qbenchmarkmeasurement_p.h"
+#include <QtTest/private/qbenchmarkmeasurement_p.h>
 #include <QtCore/QMap>
 #include <QtTest/qtest_global.h>
 #ifdef QTESTLIB_USE_VALGRIND
-#include "QtTest/private/qbenchmarkvalgrind_p.h"
+#include <QtTest/private/qbenchmarkvalgrind_p.h>
 #endif
-#include "QtTest/private/qbenchmarkevent_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
+#include <QtTest/private/qbenchmarkevent_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qbenchmarkevent.cpp b/src/testlib/qbenchmarkevent.cpp
index 86957d44b96..05d00156c81 100644
--- a/src/testlib/qbenchmarkevent.cpp
+++ b/src/testlib/qbenchmarkevent.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qbenchmarkevent_p.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
+#include <QtTest/private/qbenchmarkevent_p.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
 #include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/testlib/qbenchmarkevent_p.h b/src/testlib/qbenchmarkevent_p.h
index 2cf17ea6a28..3773aea7e75 100644
--- a/src/testlib/qbenchmarkevent_p.h
+++ b/src/testlib/qbenchmarkevent_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qbenchmarkmeasurement_p.h"
+#include <QtTest/private/qbenchmarkmeasurement_p.h>
 #include <QAbstractEventDispatcher>
 #include <QObject>
 
diff --git a/src/testlib/qbenchmarkmeasurement.cpp b/src/testlib/qbenchmarkmeasurement.cpp
index 2c14f5d3fe0..be52b4f211f 100644
--- a/src/testlib/qbenchmarkmeasurement.cpp
+++ b/src/testlib/qbenchmarkmeasurement.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qbenchmarkmeasurement_p.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
-#include "qbenchmark.h"
+#include <QtTest/private/qbenchmarkmeasurement_p.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
+#include <QtTest/qbenchmark.h>
 #include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h
index 6ca954a6190..e19a05be506 100644
--- a/src/testlib/qbenchmarkmeasurement_p.h
+++ b/src/testlib/qbenchmarkmeasurement_p.h
@@ -55,9 +55,9 @@
 
 #include <QtCore/qelapsedtimer.h>
 #ifdef HAVE_TICK_COUNTER
-#include "3rdparty/cycle_p.h"
+#include <QtTest/private/cycle_p.h>
 #endif
-#include "qbenchmark.h"
+#include <QtTest/qbenchmark.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qbenchmarkvalgrind.cpp b/src/testlib/qbenchmarkvalgrind.cpp
index 7e43d555e0f..c5117968848 100644
--- a/src/testlib/qbenchmarkvalgrind.cpp
+++ b/src/testlib/qbenchmarkvalgrind.cpp
@@ -39,17 +39,17 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qbenchmark_p.h"
+#include <QtTest/private/qbenchmark_p.h>
 
 #ifdef QTESTLIB_USE_VALGRIND
 
-#include "QtTest/private/qbenchmarkvalgrind_p.h"
+#include <QtTest/private/qbenchmarkvalgrind_p.h>
 #include <QtCore/qstringlist.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qprocess.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qset.h>
-#include "3rdparty/callgrind_p.h"
+#include <QtTest/private/callgrind_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qbenchmarkvalgrind_p.h b/src/testlib/qbenchmarkvalgrind_p.h
index 02abbcd267b..e6a0720a37e 100644
--- a/src/testlib/qbenchmarkvalgrind_p.h
+++ b/src/testlib/qbenchmarkvalgrind_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "QtTest/private/qbenchmarkmeasurement_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
+#include <QtTest/private/qbenchmarkmeasurement_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qstring.h>
 
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index 14fa752c401..b9ede077047 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/qtestassert.h"
-#include "QtTest/private/qtestlog_p.h"
-#include "QtTest/private/qplaintestlogger_p.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/qtestassert.h>
+#include <QtTest/private/qtestlog_p.h>
+#include <QtTest/private/qplaintestlogger_p.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -52,7 +52,7 @@
 #include <string.h>
 
 #ifdef Q_OS_WIN
-#include "windows.h"
+#include <windows.h>
 #endif
 
 #if defined(Q_OS_SYMBIAN)
diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp
index 71d0e8806b6..18a505066f4 100644
--- a/src/testlib/qsignaldumper.cpp
+++ b/src/testlib/qsignaldumper.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qsignaldumper_p.h"
+#include <QtTest/private/qsignaldumper_p.h>
 
 #include <QtCore/qlist.h>
 #include <QtCore/qmetaobject.h>
@@ -47,7 +47,7 @@
 #include <QtCore/qobject.h>
 #include <QtCore/qvariant.h>
 
-#include "QtTest/private/qtestlog_p.h"
+#include <QtTest/private/qtestlog_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index 35ab5a31e86..950b5d537be 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -45,7 +45,6 @@
 #include <QtTest/qtest_global.h>
 #include <QtTest/qtestcase.h>
 #include <QtTest/qtestdata.h>
-#include <QtTest/qtestdata.h>
 #include <QtTest/qbenchmark.h>
 
 #include <QtCore/qbytearray.h>
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 50f395a60ec..ff67820f15e 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "QtTest/qtestcase.h"
-#include "QtTest/qtestassert.h"
+#include <QtTest/qtestcase.h>
+#include <QtTest/qtestassert.h>
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetaobject.h>
@@ -55,13 +55,13 @@
 #include <QtCore/qprocess.h>
 #include <QtCore/qdebug.h>
 
-#include "QtTest/private/qtestlog_p.h"
-#include "QtTest/private/qtesttable_p.h"
-#include "QtTest/qtestdata.h"
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/private/qsignaldumper_p.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "3rdparty/cycle_p.h"
+#include <QtTest/private/qtestlog_p.h>
+#include <QtTest/private/qtesttable_p.h>
+#include <QtTest/qtestdata.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/private/qsignaldumper_p.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/cycle_p.h>
 
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/src/testlib/qtestdata.cpp b/src/testlib/qtestdata.cpp
index 404f2ce8557..6ee00637381 100644
--- a/src/testlib/qtestdata.cpp
+++ b/src/testlib/qtestdata.cpp
@@ -41,9 +41,9 @@
 
 #include <QtCore/qmetaobject.h>
 
-#include "QtTest/qtestassert.h"
-#include "QtTest/qtestdata.h"
-#include "QtTest/private/qtesttable_p.h"
+#include <QtTest/qtestassert.h>
+#include <QtTest/qtestdata.h>
+#include <QtTest/private/qtesttable_p.h>
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/testlib/qtestelement.cpp b/src/testlib/qtestelement.cpp
index a3c002f964d..5f109470108 100644
--- a/src/testlib/qtestelement.cpp
+++ b/src/testlib/qtestelement.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtestelement.h"
+#include <QtTest/qtestelement.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
index 9799ade577a..dda40b13fc4 100644
--- a/src/testlib/qtestelementattribute.cpp
+++ b/src/testlib/qtestelementattribute.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qtestelementattribute.h"
+#include <QtTest/qtestelementattribute.h>
 #include <QtCore/qbytearray.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index c812f6c69b4..58de6221265 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "QtTest/qtestassert.h"
+#include <QtTest/qtestassert.h>
 
-#include "QtTest/private/qtestlog_p.h"
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/private/qabstracttestlogger_p.h"
-#include "QtTest/private/qplaintestlogger_p.h"
-#include "QtTest/private/qxunittestlogger_p.h"
-#include "QtTest/private/qxmltestlogger_p.h"
+#include <QtTest/private/qtestlog_p.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/private/qabstracttestlogger_p.h>
+#include <QtTest/private/qplaintestlogger_p.h>
+#include <QtTest/private/qxunittestlogger_p.h>
+#include <QtTest/private/qxmltestlogger_p.h>
 #include <QtCore/qatomic.h>
 #include <QtCore/qbytearray.h>
 
diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index 4a6764b115a..35a3f042ada 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qtestresult_p.h"
+#include <QtTest/private/qtestresult_p.h>
 #include <QtCore/qglobal.h>
 
-#include "QtTest/private/qtestlog_p.h"
-#include "QtTest/qtestdata.h"
-#include "QtTest/qtestassert.h"
+#include <QtTest/private/qtestlog_p.h>
+#include <QtTest/qtestdata.h>
+#include <QtTest/qtestassert.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/src/testlib/qtesttable.cpp b/src/testlib/qtesttable.cpp
index 20894e572b4..0c76076b883 100644
--- a/src/testlib/qtesttable.cpp
+++ b/src/testlib/qtesttable.cpp
@@ -39,15 +39,14 @@
 **
 ****************************************************************************/
 
-#include "QtTest/private/qtesttable_p.h"
-#include "QtTest/qtestdata.h"
+#include <QtTest/private/qtesttable_p.h>
+#include <QtTest/qtestdata.h>
+#include <QtTest/qtestassert.h>
 
 #include <QtCore/qmetaobject.h>
 
 #include <string.h>
 
-#include "QtTest/qtestassert.h"
-
 QT_BEGIN_NAMESPACE
 
 class QTestTablePrivate
diff --git a/src/testlib/qtestxunitstreamer.cpp b/src/testlib/qtestxunitstreamer.cpp
index 3e9c2feffc4..b4ff109b008 100644
--- a/src/testlib/qtestxunitstreamer.cpp
+++ b/src/testlib/qtestxunitstreamer.cpp
@@ -39,15 +39,14 @@
 **
 ****************************************************************************/
 
-#include "qtestxunitstreamer.h"
-#include "qxunittestlogger_p.h"
-#include "qtestelement.h"
-#include "qtestelementattribute.h"
-#include "qtestassert.h"
-
-#include "QtTest/private/qtestlog_p.h"
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/private/qxmltestlogger_p.h"
+#include <QtTest/qtestxunitstreamer.h>
+#include <QtTest/private/qxunittestlogger_p.h>
+#include <QtTest/qtestelement.h>
+#include <QtTest/qtestelementattribute.h>
+#include <QtTest/qtestassert.h>
+#include <QtTest/private/qtestlog_p.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/private/qxmltestlogger_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp
index 304cd0a0efc..fd18d1de309 100644
--- a/src/testlib/qxmltestlogger.cpp
+++ b/src/testlib/qxmltestlogger.cpp
@@ -43,11 +43,11 @@
 #include <string.h>
 #include <QtCore/qglobal.h>
 
-#include "QtTest/private/qxmltestlogger_p.h"
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/private/qbenchmark_p.h"
-#include "QtTest/private/qbenchmarkmetric_p.h"
-#include "QtTest/qtestcase.h"
+#include <QtTest/private/qxmltestlogger_p.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/private/qbenchmark_p.h>
+#include <QtTest/private/qbenchmarkmetric_p.h>
+#include <QtTest/qtestcase.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/testlib/qxunittestlogger.cpp b/src/testlib/qxunittestlogger.cpp
index f923b2334b1..56ae43b3116 100644
--- a/src/testlib/qxunittestlogger.cpp
+++ b/src/testlib/qxunittestlogger.cpp
@@ -39,13 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qxunittestlogger_p.h"
-#include "qtestelement.h"
-#include "qtestxunitstreamer.h"
-
-#include "QtTest/qtestcase.h"
-#include "QtTest/private/qtestresult_p.h"
-#include "QtTest/private/qbenchmark_p.h"
+#include <QtTest/private/qxunittestlogger_p.h>
+#include <QtTest/qtestelement.h>
+#include <QtTest/qtestxunitstreamer.h>
+#include <QtTest/qtestcase.h>
+#include <QtTest/private/qtestresult_p.h>
+#include <QtTest/private/qbenchmark_p.h>
 
 #include <string.h>