Moved network autotests into new directory structure

Task-number: QTBUG-21223

Change-Id: I55dbf5c42a1c5d938b9e0c9bf7d90457a6c26bbc
Reviewed-on: http://codereview.qt-project.org/4259
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

282 files changed, 93 insertions, 66 deletions

diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 9305a6eb55..653e19cb3d 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -82,7 +82,6 @@ SUBDIRS=\
     qlineedit \
     qlistview \
     qlistwidget \
-    #qlocalsocket \  # FIXME: uses qtscript (QTBUG-19242)
     qmacstyle \
     qmainwindow \
     qmdisubwindow \
@@ -118,7 +117,6 @@ SUBDIRS=\
     qtabbar \
     qtableview \
     qtablewidget \
-    qtcpsocket \
     qtoolbar \
     qtoolbox \
     qtooltip \
diff --git a/tests/auto/network.pro b/tests/auto/network.pro
index 719923bd7f..8172ef8dbf 100644
--- a/tests/auto/network.pro
+++ b/tests/auto/network.pro
@@ -4,50 +4,6 @@
 # been compiled.
 TEMPLATE=subdirs
 SUBDIRS=\
+    network \
     networkselftest \
-    qabstractnetworkcache \
-    qabstractsocket \
-    qauthenticator \
-    qftp \
-    qhostaddress \
-    qhostinfo \
-    qhttp \
-    qhttpnetworkconnection \
-    qhttpnetworkreply \
-    qhttpsocketengine \
-    platformsocketengine \
-    qnetworkaccessmanager \
-    qnetworkaddressentry \
-    qnetworkcachemetadata \
-    qnetworkconfiguration \
-    qnetworkconfigurationmanager \
-    qnetworkcookie \
-    qnetworkcookiejar \
-    qnetworkdiskcache \
-    qnetworkinterface \
-    qnetworkproxy \
-    qnetworkreply \
-    qnetworkrequest \
-    qnetworksession \
     qobjectperformance \
-    qsocks5socketengine \
-    qsslcertificate \
-    qsslcipher \
-    qsslerror \
-    qsslkey \
-    qsslsocket \
-    qsslsocket_onDemandCertificates_member \
-    qsslsocket_onDemandCertificates_static \
-    qtcpserver \
-    qudpsocket \
-#    qnetworkproxyfactory \ # Uses a hardcoded proxy configuration
-
-!contains(QT_CONFIG, private_tests): SUBDIRS -= \
-    platformsocketengine \
-    qauthenticator \
-    qhostinfo \
-    qhttpnetworkconnection \
-    qhttpnetworkreply \
-    qhttpsocketengine \
-    qsocks5socketengine \
-
diff --git a/tests/auto/network/access/access.pro b/tests/auto/network/access/access.pro
new file mode 100644
index 0000000000..53b16f07b8
--- /dev/null
+++ b/tests/auto/network/access/access.pro
@@ -0,0 +1,20 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qnetworkdiskcache \
+   qnetworkcookiejar \
+   qnetworkaccessmanager \
+   qnetworkcookie \
+   qnetworkrequest \
+   qhttpnetworkconnection \
+   qnetworkreply \
+   qnetworkcachemetadata \
+   qftp \
+   qhttpnetworkreply \
+   qhttp \
+   qabstractnetworkcache \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+          qhttpnetworkconnection \
+          qhttpnetworkreply \
+
+
diff --git a/tests/auto/qabstractnetworkcache/.gitignore b/tests/auto/network/access/qabstractnetworkcache/.gitignore
index 72766dddce..72766dddce 100644
--- a/tests/auto/qabstractnetworkcache/.gitignore
+++ b/tests/auto/network/access/qabstractnetworkcache/.gitignore
diff --git a/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
index 4dea3c9c8c..4dea3c9c8c 100644
--- a/tests/auto/qabstractnetworkcache/qabstractnetworkcache.pro
+++ b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi
index 7dc506fc1e..7dc506fc1e 100755
--- a/tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi
diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi
index f2edfc161f..f2edfc161f 100755
--- a/tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi
diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi
index e44d5ed570..e44d5ed570 100755
--- a/tests/auto/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi
diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_etag200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag200.cgi
index 0966abfdd1..0966abfdd1 100755
--- a/tests/auto/qabstractnetworkcache/tests/httpcachetest_etag200.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag200.cgi
diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_etag304.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag304.cgi
index 91a4b922bd..91a4b922bd 100755
--- a/tests/auto/qabstractnetworkcache/tests/httpcachetest_etag304.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag304.cgi
diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_expires200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires200.cgi
index e18ebc86ad..e18ebc86ad 100755
--- a/tests/auto/qabstractnetworkcache/tests/httpcachetest_expires200.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires200.cgi
diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_expires304.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires304.cgi
index 1c7de1cd77..1c7de1cd77 100755
--- a/tests/auto/qabstractnetworkcache/tests/httpcachetest_expires304.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires304.cgi
diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_expires500.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires500.cgi
index 9615c4f0bd..9615c4f0bd 100755
--- a/tests/auto/qabstractnetworkcache/tests/httpcachetest_expires500.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires500.cgi
diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi
index 5dc219b1e7..5dc219b1e7 100755
--- a/tests/auto/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi
diff --git a/tests/auto/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi
index bdf23bed2f..bdf23bed2f 100755
--- a/tests/auto/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi
diff --git a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
index 3508ccf5c1..244c9b13b5 100644
--- a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
+++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
@@ -42,8 +42,8 @@
 
 #include <QtTest/QtTest>
 #include <QtNetwork/QtNetwork>
-#include "../../shared/util.h"
-#include "../network-settings.h"
+#include "../../../../shared/util.h"
+#include "../../../network-settings.h"
 
 #ifndef QT_NO_BEARERMANAGEMENT
 #include <QtNetwork/qnetworkconfigmanager.h>
diff --git a/tests/auto/qftp/.gitattributes b/tests/auto/network/access/qftp/.gitattributes
index e04709aa2e..e04709aa2e 100644
--- a/tests/auto/qftp/.gitattributes
+++ b/tests/auto/network/access/qftp/.gitattributes
diff --git a/tests/auto/qftp/.gitignore b/tests/auto/network/access/qftp/.gitignore
index 7a4845df05..7a4845df05 100644
--- a/tests/auto/qftp/.gitignore
+++ b/tests/auto/network/access/qftp/.gitignore
diff --git a/tests/auto/qftp/qftp.pro b/tests/auto/network/access/qftp/qftp.pro
index 8f63d6e26e..8f63d6e26e 100644
--- a/tests/auto/qftp/qftp.pro
+++ b/tests/auto/network/access/qftp/qftp.pro
diff --git a/tests/auto/qftp/rfc3252.txt b/tests/auto/network/access/qftp/rfc3252.txt
index b80c61bf0a..b80c61bf0a 100644
--- a/tests/auto/qftp/rfc3252.txt
+++ b/tests/auto/network/access/qftp/rfc3252.txt
diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp
index e31b5acda3..117ac92ed7 100644
--- a/tests/auto/qftp/tst_qftp.cpp
+++ b/tests/auto/network/access/qftp/tst_qftp.cpp
@@ -55,7 +55,7 @@
 #include <QNetworkSession>
 #include <QtNetwork/private/qnetworksession_p.h>
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qhttp/.gitattributes b/tests/auto/network/access/qhttp/.gitattributes
index e04709aa2e..e04709aa2e 100644
--- a/tests/auto/qhttp/.gitattributes
+++ b/tests/auto/network/access/qhttp/.gitattributes
diff --git a/tests/auto/qhttp/.gitignore b/tests/auto/network/access/qhttp/.gitignore
index 00c1f492cd..00c1f492cd 100644
--- a/tests/auto/qhttp/.gitignore
+++ b/tests/auto/network/access/qhttp/.gitignore
diff --git a/tests/auto/qhttp/dummyserver.h b/tests/auto/network/access/qhttp/dummyserver.h
index 7c14ae2f14..7c14ae2f14 100644
--- a/tests/auto/qhttp/dummyserver.h
+++ b/tests/auto/network/access/qhttp/dummyserver.h
diff --git a/tests/auto/qhttp/qhttp.pro b/tests/auto/network/access/qhttp/qhttp.pro
index f01f60f3d7..f01f60f3d7 100644
--- a/tests/auto/qhttp/qhttp.pro
+++ b/tests/auto/network/access/qhttp/qhttp.pro
diff --git a/tests/auto/qhttp/rfc3252.txt b/tests/auto/network/access/qhttp/rfc3252.txt
index b80c61bf0a..b80c61bf0a 100644
--- a/tests/auto/qhttp/rfc3252.txt
+++ b/tests/auto/network/access/qhttp/rfc3252.txt
diff --git a/tests/auto/qhttp/trolltech b/tests/auto/network/access/qhttp/trolltech
index c155360e8d..c155360e8d 100644
--- a/tests/auto/qhttp/trolltech
+++ b/tests/auto/network/access/qhttp/trolltech
diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/network/access/qhttp/tst_qhttp.cpp
index 2af81958d1..8875232714 100644
--- a/tests/auto/qhttp/tst_qhttp.cpp
+++ b/tests/auto/network/access/qhttp/tst_qhttp.cpp
@@ -57,7 +57,7 @@
 # include <qsslsocket.h>
 #endif
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qhttp/webserver/cgi-bin/retrieve_testfile.cgi b/tests/auto/network/access/qhttp/webserver/cgi-bin/retrieve_testfile.cgi
index 7896c505ca..7896c505ca 100755
--- a/tests/auto/qhttp/webserver/cgi-bin/retrieve_testfile.cgi
+++ b/tests/auto/network/access/qhttp/webserver/cgi-bin/retrieve_testfile.cgi
diff --git a/tests/auto/qhttp/webserver/cgi-bin/rfc.cgi b/tests/auto/network/access/qhttp/webserver/cgi-bin/rfc.cgi
index c68688ea31..c68688ea31 100755
--- a/tests/auto/qhttp/webserver/cgi-bin/rfc.cgi
+++ b/tests/auto/network/access/qhttp/webserver/cgi-bin/rfc.cgi
diff --git a/tests/auto/qhttp/webserver/cgi-bin/store_testfile.cgi b/tests/auto/network/access/qhttp/webserver/cgi-bin/store_testfile.cgi
index e950f2af04..e950f2af04 100755
--- a/tests/auto/qhttp/webserver/cgi-bin/store_testfile.cgi
+++ b/tests/auto/network/access/qhttp/webserver/cgi-bin/store_testfile.cgi
diff --git a/tests/auto/qhttp/webserver/index.html b/tests/auto/network/access/qhttp/webserver/index.html
index b80c61bf0a..b80c61bf0a 100644
--- a/tests/auto/qhttp/webserver/index.html
+++ b/tests/auto/network/access/qhttp/webserver/index.html
diff --git a/tests/auto/qhttp/webserver/rfc3252 b/tests/auto/network/access/qhttp/webserver/rfc3252
index b80c61bf0a..b80c61bf0a 100644
--- a/tests/auto/qhttp/webserver/rfc3252
+++ b/tests/auto/network/access/qhttp/webserver/rfc3252
diff --git a/tests/auto/qhttp/webserver/rfc3252.txt b/tests/auto/network/access/qhttp/webserver/rfc3252.txt
index b80c61bf0a..b80c61bf0a 100644
--- a/tests/auto/qhttp/webserver/rfc3252.txt
+++ b/tests/auto/network/access/qhttp/webserver/rfc3252.txt
diff --git a/tests/auto/qhttpnetworkconnection/.gitignore b/tests/auto/network/access/qhttpnetworkconnection/.gitignore
index 4fe208868b..4fe208868b 100644
--- a/tests/auto/qhttpnetworkconnection/.gitignore
+++ b/tests/auto/network/access/qhttpnetworkconnection/.gitignore
diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro
index 1ce5d8a092..1ce5d8a092 100644
--- a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
+++ b/tests/auto/network/access/qhttpnetworkconnection/qhttpnetworkconnection.pro
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index ceb0a074da..2d30f6bca1 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/network/access/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -45,7 +45,7 @@
 #include "private/qnoncontiguousbytedevice_p.h"
 #include <QAuthenticator>
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 class tst_QHttpNetworkConnection: public QObject
 {
diff --git a/tests/auto/qhttpnetworkreply/.gitignore b/tests/auto/network/access/qhttpnetworkreply/.gitignore
index fdd4e2be86..fdd4e2be86 100644
--- a/tests/auto/qhttpnetworkreply/.gitignore
+++ b/tests/auto/network/access/qhttpnetworkreply/.gitignore
diff --git a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro
index 8ce9f6f760..8ce9f6f760 100644
--- a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
+++ b/tests/auto/network/access/qhttpnetworkreply/qhttpnetworkreply.pro
diff --git a/tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp b/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp
index 513b20ec82..513b20ec82 100644
--- a/tests/auto/qhttpnetworkreply/tst_qhttpnetworkreply.cpp
+++ b/tests/auto/network/access/qhttpnetworkreply/tst_qhttpnetworkreply.cpp
diff --git a/tests/auto/qnetworkaccessmanager/qnetworkaccessmanager.pro b/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro
index 3ccbffbde8..3ccbffbde8 100644
--- a/tests/auto/qnetworkaccessmanager/qnetworkaccessmanager.pro
+++ b/tests/auto/network/access/qnetworkaccessmanager/qnetworkaccessmanager.pro
diff --git a/tests/auto/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp b/tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
index 14804b5187..14804b5187 100644
--- a/tests/auto/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
+++ b/tests/auto/network/access/qnetworkaccessmanager/tst_qnetworkaccessmanager.cpp
diff --git a/tests/auto/qnetworkcachemetadata/.gitignore b/tests/auto/network/access/qnetworkcachemetadata/.gitignore
index 76f9e574b1..76f9e574b1 100644
--- a/tests/auto/qnetworkcachemetadata/.gitignore
+++ b/tests/auto/network/access/qnetworkcachemetadata/.gitignore
diff --git a/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro
index ae0941e964..ae0941e964 100644
--- a/tests/auto/qnetworkcachemetadata/qnetworkcachemetadata.pro
+++ b/tests/auto/network/access/qnetworkcachemetadata/qnetworkcachemetadata.pro
diff --git a/tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp b/tests/auto/network/access/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp
index a5b63bd7d5..a5b63bd7d5 100644
--- a/tests/auto/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp
+++ b/tests/auto/network/access/qnetworkcachemetadata/tst_qnetworkcachemetadata.cpp
diff --git a/tests/auto/qnetworkcookie/.gitignore b/tests/auto/network/access/qnetworkcookie/.gitignore
index 90d1081d12..90d1081d12 100644
--- a/tests/auto/qnetworkcookie/.gitignore
+++ b/tests/auto/network/access/qnetworkcookie/.gitignore
diff --git a/tests/auto/qnetworkcookie/qnetworkcookie.pro b/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro
index 2f31138daf..2f31138daf 100644
--- a/tests/auto/qnetworkcookie/qnetworkcookie.pro
+++ b/tests/auto/network/access/qnetworkcookie/qnetworkcookie.pro
diff --git a/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
index a83f6dda91..a83f6dda91 100644
--- a/tests/auto/qnetworkcookie/tst_qnetworkcookie.cpp
+++ b/tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
diff --git a/tests/auto/qnetworkcookiejar/.gitignore b/tests/auto/network/access/qnetworkcookiejar/.gitignore
index 918754a274..918754a274 100644
--- a/tests/auto/qnetworkcookiejar/.gitignore
+++ b/tests/auto/network/access/qnetworkcookiejar/.gitignore
diff --git a/tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro b/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro
index 4e5f01745a..4e5f01745a 100644
--- a/tests/auto/qnetworkcookiejar/qnetworkcookiejar.pro
+++ b/tests/auto/network/access/qnetworkcookiejar/qnetworkcookiejar.pro
diff --git a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index 1b4256bb00..1b4256bb00 100644
--- a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
diff --git a/tests/auto/qnetworkdiskcache/.gitignore b/tests/auto/network/access/qnetworkdiskcache/.gitignore
index 37a1ff2a42..37a1ff2a42 100644
--- a/tests/auto/qnetworkdiskcache/.gitignore
+++ b/tests/auto/network/access/qnetworkdiskcache/.gitignore
diff --git a/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
index c05171dac7..c05171dac7 100644
--- a/tests/auto/qnetworkdiskcache/qnetworkdiskcache.pro
+++ b/tests/auto/network/access/qnetworkdiskcache/qnetworkdiskcache.pro
diff --git a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 224d1cbb59..030eae60a0 100644
--- a/tests/auto/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -43,7 +43,7 @@
 #include <QtTest/QtTest>
 #include <QtNetwork/QtNetwork>
 #include <qnetworkdiskcache.h>
-#include "../../shared/util.h"
+#include "../../../../shared/util.h"
 
 #define EXAMPLE_URL "http://user:pass@www.example.com/#foo"
 //cached objects are organized into these many subdirs
diff --git a/tests/auto/qnetworkreply/.gitattributes b/tests/auto/network/access/qnetworkreply/.gitattributes
index 80252cfd34..80252cfd34 100644
--- a/tests/auto/qnetworkreply/.gitattributes
+++ b/tests/auto/network/access/qnetworkreply/.gitattributes
diff --git a/tests/auto/qnetworkreply/.gitignore b/tests/auto/network/access/qnetworkreply/.gitignore
index 2797fcd809..2797fcd809 100644
--- a/tests/auto/qnetworkreply/.gitignore
+++ b/tests/auto/network/access/qnetworkreply/.gitignore
diff --git a/tests/auto/qnetworkreply/bigfile b/tests/auto/network/access/qnetworkreply/bigfile
index cb114a2b0e..cb114a2b0e 100644
--- a/tests/auto/qnetworkreply/bigfile
+++ b/tests/auto/network/access/qnetworkreply/bigfile
diff --git a/tests/auto/qnetworkreply/certs/aspiriniks.ca.crt b/tests/auto/network/access/qnetworkreply/certs/aspiriniks.ca.crt
index 36436b6248..36436b6248 100644
--- a/tests/auto/qnetworkreply/certs/aspiriniks.ca.crt
+++ b/tests/auto/network/access/qnetworkreply/certs/aspiriniks.ca.crt
diff --git a/tests/auto/qnetworkreply/certs/fluke.cert b/tests/auto/network/access/qnetworkreply/certs/fluke.cert
index 069fa6b341..069fa6b341 100644
--- a/tests/auto/qnetworkreply/certs/fluke.cert
+++ b/tests/auto/network/access/qnetworkreply/certs/fluke.cert
diff --git a/tests/auto/qnetworkreply/certs/fluke.key b/tests/auto/network/access/qnetworkreply/certs/fluke.key
index 9d1664d609..9d1664d609 100644
--- a/tests/auto/qnetworkreply/certs/fluke.key
+++ b/tests/auto/network/access/qnetworkreply/certs/fluke.key
diff --git a/tests/auto/qnetworkreply/certs/qt-test-server-cacert.pem b/tests/auto/network/access/qnetworkreply/certs/qt-test-server-cacert.pem
index 25bd4046e8..25bd4046e8 100644
--- a/tests/auto/qnetworkreply/certs/qt-test-server-cacert.pem
+++ b/tests/auto/network/access/qnetworkreply/certs/qt-test-server-cacert.pem
diff --git a/tests/auto/qnetworkreply/certs/server.key b/tests/auto/network/access/qnetworkreply/certs/server.key
index 9d1664d609..9d1664d609 100644
--- a/tests/auto/qnetworkreply/certs/server.key
+++ b/tests/auto/network/access/qnetworkreply/certs/server.key
diff --git a/tests/auto/qnetworkreply/certs/server.pem b/tests/auto/network/access/qnetworkreply/certs/server.pem
index 67eb495319..67eb495319 100644
--- a/tests/auto/qnetworkreply/certs/server.pem
+++ b/tests/auto/network/access/qnetworkreply/certs/server.pem
diff --git a/tests/auto/qnetworkreply/echo/echo.pro b/tests/auto/network/access/qnetworkreply/echo/echo.pro
index 74b0bfcab3..74b0bfcab3 100644
--- a/tests/auto/qnetworkreply/echo/echo.pro
+++ b/tests/auto/network/access/qnetworkreply/echo/echo.pro
diff --git a/tests/auto/qnetworkreply/echo/main.cpp b/tests/auto/network/access/qnetworkreply/echo/main.cpp
index a4ddda171a..a4ddda171a 100644
--- a/tests/auto/qnetworkreply/echo/main.cpp
+++ b/tests/auto/network/access/qnetworkreply/echo/main.cpp
diff --git a/tests/auto/qnetworkreply/empty b/tests/auto/network/access/qnetworkreply/empty
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qnetworkreply/empty
+++ b/tests/auto/network/access/qnetworkreply/empty
diff --git a/tests/auto/qnetworkreply/image1.jpg b/tests/auto/network/access/qnetworkreply/image1.jpg
index dba31c1901..dba31c1901 100644
--- a/tests/auto/qnetworkreply/image1.jpg
+++ b/tests/auto/network/access/qnetworkreply/image1.jpg
diff --git a/tests/auto/qnetworkreply/image2.jpg b/tests/auto/network/access/qnetworkreply/image2.jpg
index 72936e2de6..72936e2de6 100644
--- a/tests/auto/qnetworkreply/image2.jpg
+++ b/tests/auto/network/access/qnetworkreply/image2.jpg
diff --git a/tests/auto/qnetworkreply/image3.jpg b/tests/auto/network/access/qnetworkreply/image3.jpg
index cede519938..cede519938 100644
--- a/tests/auto/qnetworkreply/image3.jpg
+++ b/tests/auto/network/access/qnetworkreply/image3.jpg
diff --git a/tests/auto/qnetworkreply/qnetworkreply.pro b/tests/auto/network/access/qnetworkreply/qnetworkreply.pro
index 86d3155c05..86d3155c05 100644
--- a/tests/auto/qnetworkreply/qnetworkreply.pro
+++ b/tests/auto/network/access/qnetworkreply/qnetworkreply.pro
diff --git a/tests/auto/qnetworkreply/qnetworkreply.qrc b/tests/auto/network/access/qnetworkreply/qnetworkreply.qrc
index 85ca6312af..85ca6312af 100644
--- a/tests/auto/qnetworkreply/qnetworkreply.qrc
+++ b/tests/auto/network/access/qnetworkreply/qnetworkreply.qrc
diff --git a/tests/auto/qnetworkreply/resource b/tests/auto/network/access/qnetworkreply/resource
index e9b146042d..e9b146042d 100644
--- a/tests/auto/qnetworkreply/resource
+++ b/tests/auto/network/access/qnetworkreply/resource
diff --git a/tests/auto/qnetworkreply/rfc3252.txt b/tests/auto/network/access/qnetworkreply/rfc3252.txt
index b80c61bf0a..b80c61bf0a 100644
--- a/tests/auto/qnetworkreply/rfc3252.txt
+++ b/tests/auto/network/access/qnetworkreply/rfc3252.txt
diff --git a/tests/auto/qnetworkreply/smb-file.txt b/tests/auto/network/access/qnetworkreply/smb-file.txt
index 73c3ac2c07..73c3ac2c07 100644
--- a/tests/auto/qnetworkreply/smb-file.txt
+++ b/tests/auto/network/access/qnetworkreply/smb-file.txt
diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro
index dba1c69dbb..dba1c69dbb 100644
--- a/tests/auto/qnetworkreply/test/test.pro
+++ b/tests/auto/network/access/qnetworkreply/test/test.pro
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 1ae76899df..dd9fe8ee82 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -81,7 +81,7 @@
 #define SRCDIR "."
 #endif
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 Q_DECLARE_METATYPE(QSharedPointer<char>)
 Q_DECLARE_METATYPE(QNetworkReply*)
diff --git a/tests/auto/qnetworkrequest/.gitignore b/tests/auto/network/access/qnetworkrequest/.gitignore
index c814099c96..c814099c96 100644
--- a/tests/auto/qnetworkrequest/.gitignore
+++ b/tests/auto/network/access/qnetworkrequest/.gitignore
diff --git a/tests/auto/qnetworkrequest/qnetworkrequest.pro b/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro
index f96fd3bb02..f96fd3bb02 100644
--- a/tests/auto/qnetworkrequest/qnetworkrequest.pro
+++ b/tests/auto/network/access/qnetworkrequest/qnetworkrequest.pro
diff --git a/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
index 90527163e2..90527163e2 100644
--- a/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp
+++ b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
diff --git a/tests/auto/network/bearer/bearer.pro b/tests/auto/network/bearer/bearer.pro
new file mode 100644
index 0000000000..872a818e4c
--- /dev/null
+++ b/tests/auto/network/bearer/bearer.pro
@@ -0,0 +1,6 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qnetworkconfiguration \
+   qnetworkconfigurationmanager \
+   qnetworksession \
+
diff --git a/tests/auto/qbearertestcommon.h b/tests/auto/network/bearer/qbearertestcommon.h
index c16c2016e8..c16c2016e8 100644
--- a/tests/auto/qbearertestcommon.h
+++ b/tests/auto/network/bearer/qbearertestcommon.h
diff --git a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro
index ca463bdc99..ca463bdc99 100644
--- a/tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro
+++ b/tests/auto/network/bearer/qnetworkconfiguration/qnetworkconfiguration.pro
diff --git a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp b/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
index a8add01e06..a8add01e06 100644
--- a/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
+++ b/tests/auto/network/bearer/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
diff --git a/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
index d9c1d6bba6..d9c1d6bba6 100644
--- a/tests/auto/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
+++ b/tests/auto/network/bearer/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro
diff --git a/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
index d29ef77347..d29ef77347 100644
--- a/tests/auto/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
+++ b/tests/auto/network/bearer/qnetworkconfigurationmanager/tst_qnetworkconfigurationmanager.cpp
diff --git a/tests/auto/qnetworksession/lackey/lackey.pro b/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro
index 5db6743c65..5db6743c65 100644
--- a/tests/auto/qnetworksession/lackey/lackey.pro
+++ b/tests/auto/network/bearer/qnetworksession/lackey/lackey.pro
diff --git a/tests/auto/qnetworksession/lackey/main.cpp b/tests/auto/network/bearer/qnetworksession/lackey/main.cpp
index 73c52cdc8d..73c52cdc8d 100644
--- a/tests/auto/qnetworksession/lackey/main.cpp
+++ b/tests/auto/network/bearer/qnetworksession/lackey/main.cpp
diff --git a/tests/auto/qnetworksession/qnetworksession.pro b/tests/auto/network/bearer/qnetworksession/qnetworksession.pro
index 34761e53cf..34761e53cf 100644
--- a/tests/auto/qnetworksession/qnetworksession.pro
+++ b/tests/auto/network/bearer/qnetworksession/qnetworksession.pro
diff --git a/tests/auto/qnetworksession/test/test.pro b/tests/auto/network/bearer/qnetworksession/test/test.pro
index bfffe907ec..bfffe907ec 100644
--- a/tests/auto/qnetworksession/test/test.pro
+++ b/tests/auto/network/bearer/qnetworksession/test/test.pro
diff --git a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
index 0c35a552f6..0c35a552f6 100644
--- a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
+++ b/tests/auto/network/bearer/qnetworksession/test/tst_qnetworksession.cpp
diff --git a/tests/auto/network/kernel/kernel.pro b/tests/auto/network/kernel/kernel.pro
new file mode 100644
index 0000000000..d1c901d529
--- /dev/null
+++ b/tests/auto/network/kernel/kernel.pro
@@ -0,0 +1,14 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qhostinfo \
+#   qnetworkproxyfactory \ # Uses a hardcoded proxy configuration
+   qauthenticator \
+   qnetworkproxy \
+   qnetworkinterface \
+   qnetworkaddressentry \
+   qhostaddress \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+    qauthenticator \
+    qhostinfo \
+
diff --git a/tests/auto/qauthenticator/qauthenticator.pro b/tests/auto/network/kernel/qauthenticator/qauthenticator.pro
index 8ddb13b0df..8ddb13b0df 100644
--- a/tests/auto/qauthenticator/qauthenticator.pro
+++ b/tests/auto/network/kernel/qauthenticator/qauthenticator.pro
diff --git a/tests/auto/qauthenticator/tst_qauthenticator.cpp b/tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp
index ae78e10440..ae78e10440 100644
--- a/tests/auto/qauthenticator/tst_qauthenticator.cpp
+++ b/tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp
diff --git a/tests/auto/qhostaddress/.gitignore b/tests/auto/network/kernel/qhostaddress/.gitignore
index dc39ac12d4..dc39ac12d4 100644
--- a/tests/auto/qhostaddress/.gitignore
+++ b/tests/auto/network/kernel/qhostaddress/.gitignore
diff --git a/tests/auto/qhostaddress/qhostaddress.pro b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro
index 7bcbfb0165..7bcbfb0165 100644
--- a/tests/auto/qhostaddress/qhostaddress.pro
+++ b/tests/auto/network/kernel/qhostaddress/qhostaddress.pro
diff --git a/tests/auto/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
index b20e07be03..b20e07be03 100644
--- a/tests/auto/qhostaddress/tst_qhostaddress.cpp
+++ b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
diff --git a/tests/auto/qhostinfo/.gitignore b/tests/auto/network/kernel/qhostinfo/.gitignore
index 432954e8d8..432954e8d8 100644
--- a/tests/auto/qhostinfo/.gitignore
+++ b/tests/auto/network/kernel/qhostinfo/.gitignore
diff --git a/tests/auto/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
index 77ce1867d1..77ce1867d1 100644
--- a/tests/auto/qhostinfo/qhostinfo.pro
+++ b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
index 1c7df1bdae..58b51bcb69 100644
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
@@ -94,8 +94,8 @@
 # endif
 #endif
 
-#include "../network-settings.h"
-#include "../../shared/util.h"
+#include "../../../network-settings.h"
+#include "../../../../shared/util.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qnetworkaddressentry/.gitignore b/tests/auto/network/kernel/qnetworkaddressentry/.gitignore
index 375dbcfd0f..375dbcfd0f 100644
--- a/tests/auto/qnetworkaddressentry/.gitignore
+++ b/tests/auto/network/kernel/qnetworkaddressentry/.gitignore
diff --git a/tests/auto/qnetworkaddressentry/qnetworkaddressentry.pro b/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro
index 885dbf796c..885dbf796c 100644
--- a/tests/auto/qnetworkaddressentry/qnetworkaddressentry.pro
+++ b/tests/auto/network/kernel/qnetworkaddressentry/qnetworkaddressentry.pro
diff --git a/tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp b/tests/auto/network/kernel/qnetworkaddressentry/tst_qnetworkaddressentry.cpp
index 42b9af8dd3..42b9af8dd3 100644
--- a/tests/auto/qnetworkaddressentry/tst_qnetworkaddressentry.cpp
+++ b/tests/auto/network/kernel/qnetworkaddressentry/tst_qnetworkaddressentry.cpp
diff --git a/tests/auto/qnetworkinterface/.gitignore b/tests/auto/network/kernel/qnetworkinterface/.gitignore
index 237bc6d0db..237bc6d0db 100644
--- a/tests/auto/qnetworkinterface/.gitignore
+++ b/tests/auto/network/kernel/qnetworkinterface/.gitignore
diff --git a/tests/auto/qnetworkinterface/qnetworkinterface.pro b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro
index 1c5feee3f2..1c5feee3f2 100644
--- a/tests/auto/qnetworkinterface/qnetworkinterface.pro
+++ b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro
diff --git a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
index ae3436d2f6..7a2f0e578e 100644
--- a/tests/auto/qnetworkinterface/tst_qnetworkinterface.cpp
+++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
@@ -47,7 +47,7 @@
 #include <qtcpsocket.h>
 #include <QNetworkConfigurationManager>
 #include <QNetworkSession>
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_FILES=qnetworkinterface.cpp qnetworkinterface.h qnetworkinterface_unix.cpp qnetworkinterface_win.cpp
 
diff --git a/tests/auto/qnetworkproxy/.gitignore b/tests/auto/network/kernel/qnetworkproxy/.gitignore
index 74dcafa759..74dcafa759 100644
--- a/tests/auto/qnetworkproxy/.gitignore
+++ b/tests/auto/network/kernel/qnetworkproxy/.gitignore
diff --git a/tests/auto/qnetworkproxy/qnetworkproxy.pro b/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro
index fc0a216a15..fc0a216a15 100644
--- a/tests/auto/qnetworkproxy/qnetworkproxy.pro
+++ b/tests/auto/network/kernel/qnetworkproxy/qnetworkproxy.pro
diff --git a/tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp b/tests/auto/network/kernel/qnetworkproxy/tst_qnetworkproxy.cpp
index 884ed0573f..884ed0573f 100644
--- a/tests/auto/qnetworkproxy/tst_qnetworkproxy.cpp
+++ b/tests/auto/network/kernel/qnetworkproxy/tst_qnetworkproxy.cpp
diff --git a/tests/auto/qnetworkproxyfactory/.gitignore b/tests/auto/network/kernel/qnetworkproxyfactory/.gitignore
index 9be26bbda1..9be26bbda1 100644
--- a/tests/auto/qnetworkproxyfactory/.gitignore
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/.gitignore
diff --git a/tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro
index 17ad403ba7..17ad403ba7 100644
--- a/tests/auto/qnetworkproxyfactory/qnetworkproxyfactory.pro
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro
diff --git a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
index 1df6c24c10..1df6c24c10 100644
--- a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
+++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
diff --git a/tests/auto/network/network.pro b/tests/auto/network/network.pro
new file mode 100644
index 0000000000..3eafd7df70
--- /dev/null
+++ b/tests/auto/network/network.pro
@@ -0,0 +1,8 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   access \
+   bearer \
+   kernel \
+   ssl \
+   socket \
+
diff --git a/tests/auto/platformsocketengine/.gitignore b/tests/auto/network/socket/platformsocketengine/.gitignore
index afe93891ff..afe93891ff 100644
--- a/tests/auto/platformsocketengine/.gitignore
+++ b/tests/auto/network/socket/platformsocketengine/.gitignore
diff --git a/tests/auto/platformsocketengine/platformsocketengine.pri b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
index 15f31fdbb5..15f31fdbb5 100644
--- a/tests/auto/platformsocketengine/platformsocketengine.pri
+++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pri
diff --git a/tests/auto/platformsocketengine/platformsocketengine.pro b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro
index 99ae358a93..99ae358a93 100644
--- a/tests/auto/platformsocketengine/platformsocketengine.pro
+++ b/tests/auto/network/socket/platformsocketengine/platformsocketengine.pro
diff --git a/tests/auto/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
index eaaabaedac..9e93108fc7 100644
--- a/tests/auto/platformsocketengine/tst_platformsocketengine.cpp
+++ b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
@@ -79,7 +79,7 @@
 
 #include <qstringlist.h>
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_FILES=network/qnativesocketengine.cpp network/qnativesocketengine_p.h network/qnativesocketengine_unix.cpp
 
diff --git a/tests/auto/qabstractsocket/.gitignore b/tests/auto/network/socket/qabstractsocket/.gitignore
index b962a1a54b..b962a1a54b 100644
--- a/tests/auto/qabstractsocket/.gitignore
+++ b/tests/auto/network/socket/qabstractsocket/.gitignore
diff --git a/tests/auto/qabstractsocket/qabstractsocket.pro b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro
index 814a7d2600..814a7d2600 100644
--- a/tests/auto/qabstractsocket/qabstractsocket.pro
+++ b/tests/auto/network/socket/qabstractsocket/qabstractsocket.pro
diff --git a/tests/auto/qabstractsocket/tst_qabstractsocket.cpp b/tests/auto/network/socket/qabstractsocket/tst_qabstractsocket.cpp
index 309215d5ea..309215d5ea 100644
--- a/tests/auto/qabstractsocket/tst_qabstractsocket.cpp
+++ b/tests/auto/network/socket/qabstractsocket/tst_qabstractsocket.cpp
diff --git a/tests/auto/qhttpsocketengine/.gitignore b/tests/auto/network/socket/qhttpsocketengine/.gitignore
index c3eb6526ba..c3eb6526ba 100644
--- a/tests/auto/qhttpsocketengine/.gitignore
+++ b/tests/auto/network/socket/qhttpsocketengine/.gitignore
diff --git a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro
index f26abbe8d9..f26abbe8d9 100644
--- a/tests/auto/qhttpsocketengine/qhttpsocketengine.pro
+++ b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro
diff --git a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp
index 1e1a51bde0..5a90abea0e 100644
--- a/tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp
+++ b/tests/auto/network/socket/qhttpsocketengine/tst_qhttpsocketengine.cpp
@@ -54,7 +54,7 @@
 #include <qdebug.h>
 #include <qtcpserver.h>
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 class tst_QHttpSocketEngine : public QObject
 {
diff --git a/tests/auto/qlocalsocket/.gitignore b/tests/auto/network/socket/qlocalsocket/.gitignore
index b45c266ce3..b45c266ce3 100644
--- a/tests/auto/qlocalsocket/.gitignore
+++ b/tests/auto/network/socket/qlocalsocket/.gitignore
diff --git a/tests/auto/qlocalsocket/example/client/client.pro b/tests/auto/network/socket/qlocalsocket/example/client/client.pro
index 84f20d6ec0..84f20d6ec0 100644
--- a/tests/auto/qlocalsocket/example/client/client.pro
+++ b/tests/auto/network/socket/qlocalsocket/example/client/client.pro
diff --git a/tests/auto/qlocalsocket/example/client/main.cpp b/tests/auto/network/socket/qlocalsocket/example/client/main.cpp
index acf5cbc388..acf5cbc388 100644
--- a/tests/auto/qlocalsocket/example/client/main.cpp
+++ b/tests/auto/network/socket/qlocalsocket/example/client/main.cpp
diff --git a/tests/auto/qlocalsocket/example/example.pro b/tests/auto/network/socket/qlocalsocket/example/example.pro
index 8c678cd05a..8c678cd05a 100644
--- a/tests/auto/qlocalsocket/example/example.pro
+++ b/tests/auto/network/socket/qlocalsocket/example/example.pro
diff --git a/tests/auto/qlocalsocket/example/server/main.cpp b/tests/auto/network/socket/qlocalsocket/example/server/main.cpp
index 0d3de3a2e1..0d3de3a2e1 100644
--- a/tests/auto/qlocalsocket/example/server/main.cpp
+++ b/tests/auto/network/socket/qlocalsocket/example/server/main.cpp
diff --git a/tests/auto/qlocalsocket/example/server/server.pro b/tests/auto/network/socket/qlocalsocket/example/server/server.pro
index bfd14d2bb7..bfd14d2bb7 100644
--- a/tests/auto/qlocalsocket/example/server/server.pro
+++ b/tests/auto/network/socket/qlocalsocket/example/server/server.pro
diff --git a/tests/auto/qlocalsocket/lackey/lackey.pro b/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro
index 2573222c8b..2573222c8b 100644
--- a/tests/auto/qlocalsocket/lackey/lackey.pro
+++ b/tests/auto/network/socket/qlocalsocket/lackey/lackey.pro
diff --git a/tests/auto/qlocalsocket/lackey/main.cpp b/tests/auto/network/socket/qlocalsocket/lackey/main.cpp
index f7b2ff10b3..f7b2ff10b3 100644
--- a/tests/auto/qlocalsocket/lackey/main.cpp
+++ b/tests/auto/network/socket/qlocalsocket/lackey/main.cpp
diff --git a/tests/auto/qlocalsocket/lackey/scripts/client.js b/tests/auto/network/socket/qlocalsocket/lackey/scripts/client.js
index 76cc0b97ad..76cc0b97ad 100755
--- a/tests/auto/qlocalsocket/lackey/scripts/client.js
+++ b/tests/auto/network/socket/qlocalsocket/lackey/scripts/client.js
diff --git a/tests/auto/qlocalsocket/lackey/scripts/server.js b/tests/auto/network/socket/qlocalsocket/lackey/scripts/server.js
index 98a83bc9dd..98a83bc9dd 100644
--- a/tests/auto/qlocalsocket/lackey/scripts/server.js
+++ b/tests/auto/network/socket/qlocalsocket/lackey/scripts/server.js
diff --git a/tests/auto/qlocalsocket/qlocalsocket.pro b/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro
index 931c1e0602..931c1e0602 100644
--- a/tests/auto/qlocalsocket/qlocalsocket.pro
+++ b/tests/auto/network/socket/qlocalsocket/qlocalsocket.pro
diff --git a/tests/auto/qlocalsocket/test/test.pro b/tests/auto/network/socket/qlocalsocket/test/test.pro
index b2755b5411..b2755b5411 100644
--- a/tests/auto/qlocalsocket/test/test.pro
+++ b/tests/auto/network/socket/qlocalsocket/test/test.pro
diff --git a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 3dc5e7392f..57daa92f82 100644
--- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -45,7 +45,7 @@
 #include <qtextstream.h>
 #include <QtNetwork/qlocalsocket.h>
 #include <QtNetwork/qlocalserver.h>
-#include "../../shared/util.h"
+#include "../../../../shared/util.h"
 
 #ifdef Q_OS_SYMBIAN
     #include <unistd.h>
diff --git a/tests/auto/qsocks5socketengine/.gitignore b/tests/auto/network/socket/qsocks5socketengine/.gitignore
index 7d64805f3c..7d64805f3c 100644
--- a/tests/auto/qsocks5socketengine/.gitignore
+++ b/tests/auto/network/socket/qsocks5socketengine/.gitignore
diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
index 3a144aeacf..3a144aeacf 100644
--- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
+++ b/tests/auto/network/socket/qsocks5socketengine/qsocks5socketengine.pro
diff --git a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
index 83d6871d96..2678816482 100644
--- a/tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp
+++ b/tests/auto/network/socket/qsocks5socketengine/tst_qsocks5socketengine.cpp
@@ -59,7 +59,7 @@
 #include <qmetatype.h>
 #include <qdebug.h>
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 Q_DECLARE_METATYPE(QQueue<QByteArray>)
 
diff --git a/tests/auto/qtcpserver/.gitignore b/tests/auto/network/socket/qtcpserver/.gitignore
index c00e0a4ca9..c00e0a4ca9 100644
--- a/tests/auto/qtcpserver/.gitignore
+++ b/tests/auto/network/socket/qtcpserver/.gitignore
diff --git a/tests/auto/qtcpserver/crashingServer/crashingServer.pro b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro
index 700e9520ec..700e9520ec 100644
--- a/tests/auto/qtcpserver/crashingServer/crashingServer.pro
+++ b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro
diff --git a/tests/auto/qtcpserver/crashingServer/main.cpp b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp
index 35da65f671..35da65f671 100644
--- a/tests/auto/qtcpserver/crashingServer/main.cpp
+++ b/tests/auto/network/socket/qtcpserver/crashingServer/main.cpp
diff --git a/tests/auto/qtcpserver/qtcpserver.pro b/tests/auto/network/socket/qtcpserver/qtcpserver.pro
index e123cfe73b..e123cfe73b 100644
--- a/tests/auto/qtcpserver/qtcpserver.pro
+++ b/tests/auto/network/socket/qtcpserver/qtcpserver.pro
diff --git a/tests/auto/qtcpserver/test/test.pro b/tests/auto/network/socket/qtcpserver/test/test.pro
index 65e1d82613..65e1d82613 100644
--- a/tests/auto/qtcpserver/test/test.pro
+++ b/tests/auto/network/socket/qtcpserver/test/test.pro
diff --git a/tests/auto/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index b72e61f374..ca28a9c7c8 100644
--- a/tests/auto/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -73,7 +73,7 @@ Q_DECLARE_METATYPE(QList<QNetworkProxy>)
 #include <QNetworkSession>
 #include <QNetworkConfiguration>
 #include <QNetworkConfigurationManager>
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qtcpsocket/.gitignore b/tests/auto/network/socket/qtcpsocket/.gitignore
index d456ab15d0..d456ab15d0 100644
--- a/tests/auto/qtcpsocket/.gitignore
+++ b/tests/auto/network/socket/qtcpsocket/.gitignore
diff --git a/tests/auto/qtcpsocket/qtcpsocket.pro b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro
index 5dfff5bb88..5dfff5bb88 100644
--- a/tests/auto/qtcpsocket/qtcpsocket.pro
+++ b/tests/auto/network/socket/qtcpsocket/qtcpsocket.pro
diff --git a/tests/auto/qtcpsocket/stressTest/Test.cpp b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
index 995fc0528c..995fc0528c 100644
--- a/tests/auto/qtcpsocket/stressTest/Test.cpp
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.cpp
diff --git a/tests/auto/qtcpsocket/stressTest/Test.h b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h
index 5440e7ffa9..5440e7ffa9 100644
--- a/tests/auto/qtcpsocket/stressTest/Test.h
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/Test.h
diff --git a/tests/auto/qtcpsocket/stressTest/main.cpp b/tests/auto/network/socket/qtcpsocket/stressTest/main.cpp
index 76ce7bd820..76ce7bd820 100644
--- a/tests/auto/qtcpsocket/stressTest/main.cpp
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/main.cpp
diff --git a/tests/auto/qtcpsocket/stressTest/stressTest.pro b/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro
index f6215f80a0..f6215f80a0 100644
--- a/tests/auto/qtcpsocket/stressTest/stressTest.pro
+++ b/tests/auto/network/socket/qtcpsocket/stressTest/stressTest.pro
diff --git a/tests/auto/qtcpsocket/test/test.pro b/tests/auto/network/socket/qtcpsocket/test/test.pro
index 61bfaad1a1..61bfaad1a1 100644
--- a/tests/auto/qtcpsocket/test/test.pro
+++ b/tests/auto/network/socket/qtcpsocket/test/test.pro
diff --git a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 39a64ab0dc..bae3f7c2f5 100644
--- a/tests/auto/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -94,8 +94,8 @@
 
 #include "private/qhostinfo_p.h"
 
-#include "../network-settings.h"
-#include "../../shared/util.h"
+#include "../../../network-settings.h"
+#include "../../../../shared/util.h"
 
 Q_DECLARE_METATYPE(QAbstractSocket::SocketError)
 Q_DECLARE_METATYPE(QAbstractSocket::SocketState)
diff --git a/tests/auto/qudpsocket/.gitignore b/tests/auto/network/socket/qudpsocket/.gitignore
index c6134126a0..c6134126a0 100644
--- a/tests/auto/qudpsocket/.gitignore
+++ b/tests/auto/network/socket/qudpsocket/.gitignore
diff --git a/tests/auto/qudpsocket/clientserver/clientserver.pro b/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro
index 6da148659c..6da148659c 100644
--- a/tests/auto/qudpsocket/clientserver/clientserver.pro
+++ b/tests/auto/network/socket/qudpsocket/clientserver/clientserver.pro
diff --git a/tests/auto/qudpsocket/clientserver/main.cpp b/tests/auto/network/socket/qudpsocket/clientserver/main.cpp
index 9145a5199f..9145a5199f 100644
--- a/tests/auto/qudpsocket/clientserver/main.cpp
+++ b/tests/auto/network/socket/qudpsocket/clientserver/main.cpp
diff --git a/tests/auto/qudpsocket/qudpsocket.pro b/tests/auto/network/socket/qudpsocket/qudpsocket.pro
index 4ddb7178a4..4ddb7178a4 100644
--- a/tests/auto/qudpsocket/qudpsocket.pro
+++ b/tests/auto/network/socket/qudpsocket/qudpsocket.pro
diff --git a/tests/auto/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro
index 508dc97053..508dc97053 100644
--- a/tests/auto/qudpsocket/test/test.pro
+++ b/tests/auto/network/socket/qudpsocket/test/test.pro
diff --git a/tests/auto/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
index ad7bfbb116..83d30cc40a 100644
--- a/tests/auto/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@@ -53,7 +53,7 @@
 #include <QNetworkInterface>
 
 #include <qstringlist.h>
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 #ifndef QT_NO_BEARERMANAGEMENT
 #include <QtNetwork/qnetworkconfigmanager.h>
diff --git a/tests/auto/qudpsocket/udpServer/main.cpp b/tests/auto/network/socket/qudpsocket/udpServer/main.cpp
index ff3ca111d0..ff3ca111d0 100644
--- a/tests/auto/qudpsocket/udpServer/main.cpp
+++ b/tests/auto/network/socket/qudpsocket/udpServer/main.cpp
diff --git a/tests/auto/qudpsocket/udpServer/udpServer.pro b/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro
index 7438d40fb0..7438d40fb0 100644
--- a/tests/auto/qudpsocket/udpServer/udpServer.pro
+++ b/tests/auto/network/socket/qudpsocket/udpServer/udpServer.pro
diff --git a/tests/auto/network/socket/socket.pro b/tests/auto/network/socket/socket.pro
new file mode 100644
index 0000000000..49fb52d1a5
--- /dev/null
+++ b/tests/auto/network/socket/socket.pro
@@ -0,0 +1,17 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qhttpsocketengine \
+   qudpsocket \
+   qtcpsocket \
+   #qlocalsocket \  # FIXME: uses qtscript (QTBUG-19242)
+   qtcpserver \
+   qsocks5socketengine \
+   qabstractsocket \
+   platformsocketengine \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+          platformsocketengine \
+          qhttpsocketengine \
+          qsocks5socketengine \
+
+
diff --git a/tests/auto/qsslcertificate/.gitignore b/tests/auto/network/ssl/qsslcertificate/.gitignore
index 25b34756b7..25b34756b7 100644
--- a/tests/auto/qsslcertificate/.gitignore
+++ b/tests/auto/network/ssl/qsslcertificate/.gitignore
diff --git a/tests/auto/qsslcertificate/certificates/ca-cert.pem b/tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem
index bcba68aefa..bcba68aefa 100644
--- a/tests/auto/qsslcertificate/certificates/ca-cert.pem
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem
diff --git a/tests/auto/qsslcertificate/certificates/ca-cert.pem.digest-md5 b/tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem.digest-md5
index 800a05b030..800a05b030 100644
--- a/tests/auto/qsslcertificate/certificates/ca-cert.pem.digest-md5
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem.digest-md5
diff --git a/tests/auto/qsslcertificate/certificates/ca-cert.pem.digest-sha1 b/tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem.digest-sha1
index df311a8dcb..df311a8dcb 100644
--- a/tests/auto/qsslcertificate/certificates/ca-cert.pem.digest-sha1
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/ca-cert.pem.digest-sha1
diff --git a/tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san-utf8.pem
index e1b731d69b..e1b731d69b 100644
--- a/tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san-utf8.pem
diff --git a/tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem.san b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san-utf8.pem.san
index f46a637da4..f46a637da4 100644
--- a/tests/auto/qsslcertificate/certificates/cert-ss-san-utf8.pem.san
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san-utf8.pem.san
diff --git a/tests/auto/qsslcertificate/certificates/cert-ss-san.pem b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san.pem
index 3d0bdfcee8..3d0bdfcee8 100644
--- a/tests/auto/qsslcertificate/certificates/cert-ss-san.pem
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san.pem
diff --git a/tests/auto/qsslcertificate/certificates/cert-ss-san.pem.san b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san.pem.san
index f46a637da4..f46a637da4 100644
--- a/tests/auto/qsslcertificate/certificates/cert-ss-san.pem.san
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss-san.pem.san
diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.der b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.der
index ea9eedc643..ea9eedc643 100644
--- a/tests/auto/qsslcertificate/certificates/cert-ss.der
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.der
diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.der.pubkey b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.der.pubkey
index 48d2b99c3a..48d2b99c3a 100644
--- a/tests/auto/qsslcertificate/certificates/cert-ss.der.pubkey
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.der.pubkey
diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.pem b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem
index b2626f3d1a..b2626f3d1a 100644
--- a/tests/auto/qsslcertificate/certificates/cert-ss.pem
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem
diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.pem.digest-md5 b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.digest-md5
index 62f4d76072..62f4d76072 100644
--- a/tests/auto/qsslcertificate/certificates/cert-ss.pem.digest-md5
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.digest-md5
diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.pem.digest-sha1 b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.digest-sha1
index 02430ed89b..02430ed89b 100644
--- a/tests/auto/qsslcertificate/certificates/cert-ss.pem.digest-sha1
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.digest-sha1
diff --git a/tests/auto/qsslcertificate/certificates/cert-ss.pem.pubkey b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.pubkey
index 5344d112cb..5344d112cb 100644
--- a/tests/auto/qsslcertificate/certificates/cert-ss.pem.pubkey
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert-ss.pem.pubkey
diff --git a/tests/auto/qsslcertificate/certificates/cert.der b/tests/auto/network/ssl/qsslcertificate/certificates/cert.der
index aeb8571817..aeb8571817 100644
--- a/tests/auto/qsslcertificate/certificates/cert.der
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert.der
diff --git a/tests/auto/qsslcertificate/certificates/cert.der.pubkey b/tests/auto/network/ssl/qsslcertificate/certificates/cert.der.pubkey
index 48d2b99c3a..48d2b99c3a 100644
--- a/tests/auto/qsslcertificate/certificates/cert.der.pubkey
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert.der.pubkey
diff --git a/tests/auto/qsslcertificate/certificates/cert.pem b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem
index 295010c210..295010c210 100644
--- a/tests/auto/qsslcertificate/certificates/cert.pem
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem
diff --git a/tests/auto/qsslcertificate/certificates/cert.pem.digest-md5 b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.digest-md5
index 5333f63f06..5333f63f06 100644
--- a/tests/auto/qsslcertificate/certificates/cert.pem.digest-md5
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.digest-md5
diff --git a/tests/auto/qsslcertificate/certificates/cert.pem.digest-sha1 b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.digest-sha1
index 62f84deb96..62f84deb96 100644
--- a/tests/auto/qsslcertificate/certificates/cert.pem.digest-sha1
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.digest-sha1
diff --git a/tests/auto/qsslcertificate/certificates/cert.pem.pubkey b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.pubkey
index 5344d112cb..5344d112cb 100644
--- a/tests/auto/qsslcertificate/certificates/cert.pem.pubkey
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/cert.pem.pubkey
diff --git a/tests/auto/qsslcertificate/certificates/gencertificates.sh b/tests/auto/network/ssl/qsslcertificate/certificates/gencertificates.sh
index 0bac191326..0bac191326 100755
--- a/tests/auto/qsslcertificate/certificates/gencertificates.sh
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/gencertificates.sh
diff --git a/tests/auto/qsslcertificate/certificates/san.cnf b/tests/auto/network/ssl/qsslcertificate/certificates/san.cnf
index f46a637da4..f46a637da4 100644
--- a/tests/auto/qsslcertificate/certificates/san.cnf
+++ b/tests/auto/network/ssl/qsslcertificate/certificates/san.cnf
diff --git a/tests/auto/qsslcertificate/more-certificates/badguy-nul-cn.crt b/tests/auto/network/ssl/qsslcertificate/more-certificates/badguy-nul-cn.crt
index b899733bbd..b899733bbd 100644
--- a/tests/auto/qsslcertificate/more-certificates/badguy-nul-cn.crt
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/badguy-nul-cn.crt
diff --git a/tests/auto/qsslcertificate/more-certificates/badguy-nul-san.crt b/tests/auto/network/ssl/qsslcertificate/more-certificates/badguy-nul-san.crt
index d897c3915e..d897c3915e 100644
--- a/tests/auto/qsslcertificate/more-certificates/badguy-nul-san.crt
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/badguy-nul-san.crt
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted-google.com-diginotar.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted-google.com-diginotar.pem
index 12bbcae082..12bbcae082 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted-google.com-diginotar.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted-google.com-diginotar.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted1.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted1.pem
index 7fc0a054c0..7fc0a054c0 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted1.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted1.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted2.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted2.pem
index 3c8489fbcd..3c8489fbcd 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted2.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted2.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted3.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted3.pem
index fa458cca36..fa458cca36 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted3.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted3.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted4.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted4.pem
index 53761bb36a..53761bb36a 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted4.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted4.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted5.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted5.pem
index 81211ee694..81211ee694 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted5.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted5.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted6.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted6.pem
index 4264a678f1..4264a678f1 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted6.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted6.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted7.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted7.pem
index 03ab7d46b0..03ab7d46b0 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted7.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted7.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted8.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted8.pem
index acef06ffb0..acef06ffb0 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted8.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted8.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/blacklisted9.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted9.pem
index cc99b08e5f..cc99b08e5f 100644
--- a/tests/auto/qsslcertificate/more-certificates/blacklisted9.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/blacklisted9.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.pem
index 416dd4da04..416dd4da04 100644
--- a/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.txt.0.9.8 b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.0.9.8
index 20500b221f..20500b221f 100644
--- a/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.txt.0.9.8
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.0.9.8
diff --git a/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.txt.1.0.0 b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.1.0.0
index b2ccb2751e..b2ccb2751e 100644
--- a/tests/auto/qsslcertificate/more-certificates/cert-large-expiration-date.txt.1.0.0
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-expiration-date.txt.1.0.0
diff --git a/tests/auto/qsslcertificate/more-certificates/cert-large-serial-number.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-serial-number.pem
index ecb6c35632..ecb6c35632 100644
--- a/tests/auto/qsslcertificate/more-certificates/cert-large-serial-number.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/cert-large-serial-number.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/malformed-just-begin-no-newline.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/malformed-just-begin-no-newline.pem
index 75f3c32241..75f3c32241 100644
--- a/tests/auto/qsslcertificate/more-certificates/malformed-just-begin-no-newline.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/malformed-just-begin-no-newline.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/malformed-just-begin.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/malformed-just-begin.pem
index a71aecf9af..a71aecf9af 100644
--- a/tests/auto/qsslcertificate/more-certificates/malformed-just-begin.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/malformed-just-begin.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/natwest-banking.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/natwest-banking.pem
index c3e303c770..c3e303c770 100644
--- a/tests/auto/qsslcertificate/more-certificates/natwest-banking.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/natwest-banking.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/no-ending-newline.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/no-ending-newline.pem
index f8056c72d0..f8056c72d0 100644
--- a/tests/auto/qsslcertificate/more-certificates/no-ending-newline.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/no-ending-newline.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/test-cn-two-cns-cert.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/test-cn-two-cns-cert.pem
index 08176289d7..08176289d7 100644
--- a/tests/auto/qsslcertificate/more-certificates/test-cn-two-cns-cert.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/test-cn-two-cns-cert.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/test-cn-with-drink-cert.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/test-cn-with-drink-cert.pem
index ed8823a520..ed8823a520 100644
--- a/tests/auto/qsslcertificate/more-certificates/test-cn-with-drink-cert.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/test-cn-with-drink-cert.pem
diff --git a/tests/auto/qsslcertificate/more-certificates/trailing-whitespace.pem b/tests/auto/network/ssl/qsslcertificate/more-certificates/trailing-whitespace.pem
index e48195d15e..e48195d15e 100644
--- a/tests/auto/qsslcertificate/more-certificates/trailing-whitespace.pem
+++ b/tests/auto/network/ssl/qsslcertificate/more-certificates/trailing-whitespace.pem
diff --git a/tests/auto/qsslcertificate/qsslcertificate.pro b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro
index 05cce8e509..05cce8e509 100644
--- a/tests/auto/qsslcertificate/qsslcertificate.pro
+++ b/tests/auto/network/ssl/qsslcertificate/qsslcertificate.pro
diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
index bcd21eefe2..bcd21eefe2 100644
--- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp
+++ b/tests/auto/network/ssl/qsslcertificate/tst_qsslcertificate.cpp
diff --git a/tests/auto/qsslcertificate/verify-certs/README b/tests/auto/network/ssl/qsslcertificate/verify-certs/README
index 87cb293ef6..87cb293ef6 100644
--- a/tests/auto/qsslcertificate/verify-certs/README
+++ b/tests/auto/network/ssl/qsslcertificate/verify-certs/README
diff --git a/tests/auto/qsslcertificate/verify-certs/cacert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/cacert.pem
index 8c75c54bcb..8c75c54bcb 100644
--- a/tests/auto/qsslcertificate/verify-certs/cacert.pem
+++ b/tests/auto/network/ssl/qsslcertificate/verify-certs/cacert.pem
diff --git a/tests/auto/qsslcertificate/verify-certs/test-addons-mozilla-org-cert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-addons-mozilla-org-cert.pem
index 07123e8577..07123e8577 100644
--- a/tests/auto/qsslcertificate/verify-certs/test-addons-mozilla-org-cert.pem
+++ b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-addons-mozilla-org-cert.pem
diff --git a/tests/auto/qsslcertificate/verify-certs/test-intermediate-ca-cert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-ca-cert.pem
index d00490caba..d00490caba 100644
--- a/tests/auto/qsslcertificate/verify-certs/test-intermediate-ca-cert.pem
+++ b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-ca-cert.pem
diff --git a/tests/auto/qsslcertificate/verify-certs/test-intermediate-is-ca-cert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-is-ca-cert.pem
index 396cad86cb..396cad86cb 100644
--- a/tests/auto/qsslcertificate/verify-certs/test-intermediate-is-ca-cert.pem
+++ b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-is-ca-cert.pem
diff --git a/tests/auto/qsslcertificate/verify-certs/test-intermediate-not-ca-cert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-not-ca-cert.pem
index 34ad2b10a8..34ad2b10a8 100644
--- a/tests/auto/qsslcertificate/verify-certs/test-intermediate-not-ca-cert.pem
+++ b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-intermediate-not-ca-cert.pem
diff --git a/tests/auto/qsslcertificate/verify-certs/test-ocsp-good-cert.pem b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-ocsp-good-cert.pem
index 34b26c6d5e..34b26c6d5e 100644
--- a/tests/auto/qsslcertificate/verify-certs/test-ocsp-good-cert.pem
+++ b/tests/auto/network/ssl/qsslcertificate/verify-certs/test-ocsp-good-cert.pem
diff --git a/tests/auto/qsslcipher/.gitignore b/tests/auto/network/ssl/qsslcipher/.gitignore
index 13137ce3aa..13137ce3aa 100644
--- a/tests/auto/qsslcipher/.gitignore
+++ b/tests/auto/network/ssl/qsslcipher/.gitignore
diff --git a/tests/auto/qsslcipher/qsslcipher.pro b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro
index 78fd387069..78fd387069 100644
--- a/tests/auto/qsslcipher/qsslcipher.pro
+++ b/tests/auto/network/ssl/qsslcipher/qsslcipher.pro
diff --git a/tests/auto/qsslcipher/tst_qsslcipher.cpp b/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp
index 5fe4d03bdd..5fe4d03bdd 100644
--- a/tests/auto/qsslcipher/tst_qsslcipher.cpp
+++ b/tests/auto/network/ssl/qsslcipher/tst_qsslcipher.cpp
diff --git a/tests/auto/qsslerror/.gitignore b/tests/auto/network/ssl/qsslerror/.gitignore
index e30995e94a..e30995e94a 100644
--- a/tests/auto/qsslerror/.gitignore
+++ b/tests/auto/network/ssl/qsslerror/.gitignore
diff --git a/tests/auto/qsslerror/qsslerror.pro b/tests/auto/network/ssl/qsslerror/qsslerror.pro
index 5b907fb600..5b907fb600 100644
--- a/tests/auto/qsslerror/qsslerror.pro
+++ b/tests/auto/network/ssl/qsslerror/qsslerror.pro
diff --git a/tests/auto/qsslerror/tst_qsslerror.cpp b/tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp
index 3fae88ec00..3fae88ec00 100644
--- a/tests/auto/qsslerror/tst_qsslerror.cpp
+++ b/tests/auto/network/ssl/qsslerror/tst_qsslerror.cpp
diff --git a/tests/auto/qsslkey/.gitignore b/tests/auto/network/ssl/qsslkey/.gitignore
index 7c9a790dd7..7c9a790dd7 100644
--- a/tests/auto/qsslkey/.gitignore
+++ b/tests/auto/network/ssl/qsslkey/.gitignore
diff --git a/tests/auto/qsslkey/keys/dsa-pri-1024.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-1024.der
index 5b4026bef3..5b4026bef3 100644
--- a/tests/auto/qsslkey/keys/dsa-pri-1024.der
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-1024.der
diff --git a/tests/auto/qsslkey/keys/dsa-pri-1024.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-1024.pem
index cdb16c3841..cdb16c3841 100644
--- a/tests/auto/qsslkey/keys/dsa-pri-1024.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-1024.pem
diff --git a/tests/auto/qsslkey/keys/dsa-pri-512.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512.der
index 0fc977f4e4..0fc977f4e4 100644
--- a/tests/auto/qsslkey/keys/dsa-pri-512.der
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512.der
diff --git a/tests/auto/qsslkey/keys/dsa-pri-512.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512.pem
index 35210e4dec..35210e4dec 100644
--- a/tests/auto/qsslkey/keys/dsa-pri-512.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-512.pem
diff --git a/tests/auto/qsslkey/keys/dsa-pri-576.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-576.der
index 30cea46c1e..30cea46c1e 100644
--- a/tests/auto/qsslkey/keys/dsa-pri-576.der
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-576.der
diff --git a/tests/auto/qsslkey/keys/dsa-pri-576.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-576.pem
index a398ddcf13..a398ddcf13 100644
--- a/tests/auto/qsslkey/keys/dsa-pri-576.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-576.pem
diff --git a/tests/auto/qsslkey/keys/dsa-pri-960.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-960.der
index d8291b87ca..d8291b87ca 100644
--- a/tests/auto/qsslkey/keys/dsa-pri-960.der
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-960.der
diff --git a/tests/auto/qsslkey/keys/dsa-pri-960.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-960.pem
index 054c174ecf..054c174ecf 100644
--- a/tests/auto/qsslkey/keys/dsa-pri-960.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pri-960.pem
diff --git a/tests/auto/qsslkey/keys/dsa-pub-1024.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-1024.der
index efff9d27c3..efff9d27c3 100644
--- a/tests/auto/qsslkey/keys/dsa-pub-1024.der
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-1024.der
diff --git a/tests/auto/qsslkey/keys/dsa-pub-1024.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-1024.pem
index f39bc37814..f39bc37814 100644
--- a/tests/auto/qsslkey/keys/dsa-pub-1024.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-1024.pem
diff --git a/tests/auto/qsslkey/keys/dsa-pub-512.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-512.der
index 5d60a6576a..5d60a6576a 100644
--- a/tests/auto/qsslkey/keys/dsa-pub-512.der
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-512.der
diff --git a/tests/auto/qsslkey/keys/dsa-pub-512.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-512.pem
index df5f99982e..df5f99982e 100644
--- a/tests/auto/qsslkey/keys/dsa-pub-512.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-512.pem
diff --git a/tests/auto/qsslkey/keys/dsa-pub-576.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-576.der
index 8c67395210..8c67395210 100644
--- a/tests/auto/qsslkey/keys/dsa-pub-576.der
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-576.der
diff --git a/tests/auto/qsslkey/keys/dsa-pub-576.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-576.pem
index 3a594bfecb..3a594bfecb 100644
--- a/tests/auto/qsslkey/keys/dsa-pub-576.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-576.pem
diff --git a/tests/auto/qsslkey/keys/dsa-pub-960.der b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-960.der
index 58c80e805e..58c80e805e 100644
--- a/tests/auto/qsslkey/keys/dsa-pub-960.der
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-960.der
diff --git a/tests/auto/qsslkey/keys/dsa-pub-960.pem b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-960.pem
index bcdc9e343e..bcdc9e343e 100644
--- a/tests/auto/qsslkey/keys/dsa-pub-960.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/dsa-pub-960.pem
diff --git a/tests/auto/qsslkey/keys/genkeys.sh b/tests/auto/network/ssl/qsslkey/keys/genkeys.sh
index 559ef5cf5d..559ef5cf5d 100755
--- a/tests/auto/qsslkey/keys/genkeys.sh
+++ b/tests/auto/network/ssl/qsslkey/keys/genkeys.sh
diff --git a/tests/auto/qsslkey/keys/rsa-pri-1023.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1023.der
index d23dde8058..d23dde8058 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-1023.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1023.der
diff --git a/tests/auto/qsslkey/keys/rsa-pri-1023.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1023.pem
index bd1c119217..bd1c119217 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-1023.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1023.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pri-1024.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1024.der
index 0ea20598f0..0ea20598f0 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-1024.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1024.der
diff --git a/tests/auto/qsslkey/keys/rsa-pri-1024.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1024.pem
index f2fc5b0064..f2fc5b0064 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-1024.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-1024.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pri-2048.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-2048.der
index 194da2adf2..194da2adf2 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-2048.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-2048.der
diff --git a/tests/auto/qsslkey/keys/rsa-pri-2048.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-2048.pem
index 125d281792..125d281792 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-2048.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-2048.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pri-40.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-40.der
index 227cbbba00..227cbbba00 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-40.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-40.der
diff --git a/tests/auto/qsslkey/keys/rsa-pri-40.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-40.pem
index e480b11029..e480b11029 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-40.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-40.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pri-511.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-511.der
index 43da25456e..43da25456e 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-511.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-511.der
diff --git a/tests/auto/qsslkey/keys/rsa-pri-511.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-511.pem
index 70872d9814..70872d9814 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-511.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-511.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pri-512.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512.der
index 156a1d1439..156a1d1439 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-512.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512.der
diff --git a/tests/auto/qsslkey/keys/rsa-pri-512.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512.pem
index dda274f50c..dda274f50c 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-512.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-512.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pri-999.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-999.der
index 3b3f8ca6d5..3b3f8ca6d5 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-999.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-999.der
diff --git a/tests/auto/qsslkey/keys/rsa-pri-999.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-999.pem
index 6ed72bf1f9..6ed72bf1f9 100644
--- a/tests/auto/qsslkey/keys/rsa-pri-999.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pri-999.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pub-1023.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1023.der
index 4b16fdddd0..4b16fdddd0 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-1023.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1023.der
diff --git a/tests/auto/qsslkey/keys/rsa-pub-1023.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1023.pem
index 174a135514..174a135514 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-1023.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1023.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pub-1024.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1024.der
index 96495920d0..96495920d0 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-1024.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1024.der
diff --git a/tests/auto/qsslkey/keys/rsa-pub-1024.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1024.pem
index d5c8da9144..d5c8da9144 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-1024.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-1024.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pub-2048.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-2048.der
index 560487b67e..560487b67e 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-2048.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-2048.der
diff --git a/tests/auto/qsslkey/keys/rsa-pub-2048.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-2048.pem
index 95daf33896..95daf33896 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-2048.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-2048.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pub-40.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-40.der
index 3d789a7e11..3d789a7e11 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-40.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-40.der
diff --git a/tests/auto/qsslkey/keys/rsa-pub-40.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-40.pem
index f053580d90..f053580d90 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-40.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-40.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pub-511.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-511.der
index 2da3341554..2da3341554 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-511.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-511.der
diff --git a/tests/auto/qsslkey/keys/rsa-pub-511.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-511.pem
index a5135f0e4c..a5135f0e4c 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-511.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-511.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pub-512.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-512.der
index 372ba8f8b5..372ba8f8b5 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-512.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-512.der
diff --git a/tests/auto/qsslkey/keys/rsa-pub-512.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-512.pem
index d3a5e5882f..d3a5e5882f 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-512.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-512.pem
diff --git a/tests/auto/qsslkey/keys/rsa-pub-999.der b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-999.der
index 1d28000501..1d28000501 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-999.der
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-999.der
diff --git a/tests/auto/qsslkey/keys/rsa-pub-999.pem b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-999.pem
index 00ba47915a..00ba47915a 100644
--- a/tests/auto/qsslkey/keys/rsa-pub-999.pem
+++ b/tests/auto/network/ssl/qsslkey/keys/rsa-pub-999.pem
diff --git a/tests/auto/qsslkey/qsslkey.pro b/tests/auto/network/ssl/qsslkey/qsslkey.pro
index 5a90b76219..5a90b76219 100644
--- a/tests/auto/qsslkey/qsslkey.pro
+++ b/tests/auto/network/ssl/qsslkey/qsslkey.pro
diff --git a/tests/auto/qsslkey/rsa-with-passphrase.pem b/tests/auto/network/ssl/qsslkey/rsa-with-passphrase.pem
index cb29becc31..cb29becc31 100644
--- a/tests/auto/qsslkey/rsa-with-passphrase.pem
+++ b/tests/auto/network/ssl/qsslkey/rsa-with-passphrase.pem
diff --git a/tests/auto/qsslkey/rsa-without-passphrase.pem b/tests/auto/network/ssl/qsslkey/rsa-without-passphrase.pem
index f7c834b116..f7c834b116 100644
--- a/tests/auto/qsslkey/rsa-without-passphrase.pem
+++ b/tests/auto/network/ssl/qsslkey/rsa-without-passphrase.pem
diff --git a/tests/auto/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
index ac966ce74a..ac966ce74a 100644
--- a/tests/auto/qsslkey/tst_qsslkey.cpp
+++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
diff --git a/tests/auto/qsslsocket/.gitignore b/tests/auto/network/ssl/qsslsocket/.gitignore
index f2319a97eb..f2319a97eb 100644
--- a/tests/auto/qsslsocket/.gitignore
+++ b/tests/auto/network/ssl/qsslsocket/.gitignore
diff --git a/tests/auto/qsslsocket/certs/aspiriniks.ca.crt b/tests/auto/network/ssl/qsslsocket/certs/aspiriniks.ca.crt
index 36436b6248..36436b6248 100644
--- a/tests/auto/qsslsocket/certs/aspiriniks.ca.crt
+++ b/tests/auto/network/ssl/qsslsocket/certs/aspiriniks.ca.crt
diff --git a/tests/auto/qsslsocket/certs/fake-login.live.com.key b/tests/auto/network/ssl/qsslsocket/certs/fake-login.live.com.key
index 692a7bd85d..692a7bd85d 100644
--- a/tests/auto/qsslsocket/certs/fake-login.live.com.key
+++ b/tests/auto/network/ssl/qsslsocket/certs/fake-login.live.com.key
diff --git a/tests/auto/qsslsocket/certs/fake-login.live.com.pem b/tests/auto/network/ssl/qsslsocket/certs/fake-login.live.com.pem
index 429f95187c..429f95187c 100644
--- a/tests/auto/qsslsocket/certs/fake-login.live.com.pem
+++ b/tests/auto/network/ssl/qsslsocket/certs/fake-login.live.com.pem
diff --git a/tests/auto/qsslsocket/certs/fluke.cert b/tests/auto/network/ssl/qsslsocket/certs/fluke.cert
index 069fa6b341..069fa6b341 100644
--- a/tests/auto/qsslsocket/certs/fluke.cert
+++ b/tests/auto/network/ssl/qsslsocket/certs/fluke.cert
diff --git a/tests/auto/qsslsocket/certs/fluke.key b/tests/auto/network/ssl/qsslsocket/certs/fluke.key
index 9d1664d609..9d1664d609 100644
--- a/tests/auto/qsslsocket/certs/fluke.key
+++ b/tests/auto/network/ssl/qsslsocket/certs/fluke.key
diff --git a/tests/auto/qsslsocket/certs/qt-test-server-cacert.pem b/tests/auto/network/ssl/qsslsocket/certs/qt-test-server-cacert.pem
index 25bd4046e8..25bd4046e8 100644
--- a/tests/auto/qsslsocket/certs/qt-test-server-cacert.pem
+++ b/tests/auto/network/ssl/qsslsocket/certs/qt-test-server-cacert.pem
diff --git a/tests/auto/qsslsocket/qsslsocket.pro b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
index 1f5c7f6aaf..1f5c7f6aaf 100644
--- a/tests/auto/qsslsocket/qsslsocket.pro
+++ b/tests/auto/network/ssl/qsslsocket/qsslsocket.pro
diff --git a/tests/auto/qsslsocket/ssl.tar.gz b/tests/auto/network/ssl/qsslsocket/ssl.tar.gz
index b59af51f46..b59af51f46 100644
--- a/tests/auto/qsslsocket/ssl.tar.gz
+++ b/tests/auto/network/ssl/qsslsocket/ssl.tar.gz
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index ee2d15b1ff..6b7720308d 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -60,7 +60,7 @@
 #include "private/qsslsocket_openssl_symbols_p.h"
 #endif
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 Q_DECLARE_METATYPE(QAbstractSocket::SocketState)
 Q_DECLARE_METATYPE(QAbstractSocket::SocketError)
diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro
new file mode 100644
index 0000000000..fd57a1729b
--- /dev/null
+++ b/tests/auto/network/ssl/ssl.pro
@@ -0,0 +1,8 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qsslcertificate \
+   qsslcipher \
+   qsslerror \
+   qsslsocket \
+   qsslkey \
+