diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index c16f00ff8b5..8319e4aa203 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro

diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index 5282e08f17d..7269f890a76 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro

diff --git a/tests/auto/qsignalspy/.gitignore b/tests/auto/testlib/qsignalspy/.gitignore
index 4d5c31727eb..4d5c31727eb 100644
--- a/tests/auto/qsignalspy/.gitignore
+++ b/tests/auto/testlib/qsignalspy/.gitignore

diff --git a/tests/auto/qsignalspy/qsignalspy.pro b/tests/auto/testlib/qsignalspy/qsignalspy.pro
index d3ae63b5bcf..d3ae63b5bcf 100644
--- a/tests/auto/qsignalspy/qsignalspy.pro
+++ b/tests/auto/testlib/qsignalspy/qsignalspy.pro

diff --git a/tests/auto/qsignalspy/tst_qsignalspy.cpp b/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp
index f8e8553e7c4..f8e8553e7c4 100644
--- a/tests/auto/qsignalspy/tst_qsignalspy.cpp
+++ b/tests/auto/testlib/qsignalspy/tst_qsignalspy.cpp

diff --git a/tests/auto/selftests/.gitignore b/tests/auto/testlib/selftests/.gitignore
index 56ba17abd70..56ba17abd70 100644
--- a/tests/auto/selftests/.gitignore
+++ b/tests/auto/testlib/selftests/.gitignore

diff --git a/tests/auto/selftests/alive/.gitignore b/tests/auto/testlib/selftests/alive/.gitignore
index 561285c5d05..561285c5d05 100644
--- a/tests/auto/selftests/alive/.gitignore
+++ b/tests/auto/testlib/selftests/alive/.gitignore

diff --git a/tests/auto/selftests/alive/alive.pro b/tests/auto/testlib/selftests/alive/alive.pro
index 7660933a58a..7660933a58a 100644
--- a/tests/auto/selftests/alive/alive.pro
+++ b/tests/auto/testlib/selftests/alive/alive.pro

diff --git a/tests/auto/selftests/alive/qtestalive.cpp b/tests/auto/testlib/selftests/alive/qtestalive.cpp
index dd3d411ce51..dd3d411ce51 100644
--- a/tests/auto/selftests/alive/qtestalive.cpp
+++ b/tests/auto/testlib/selftests/alive/qtestalive.cpp

diff --git a/tests/auto/selftests/alive/tst_alive.cpp b/tests/auto/testlib/selftests/alive/tst_alive.cpp
index f29aebb1761..f29aebb1761 100644
--- a/tests/auto/selftests/alive/tst_alive.cpp
+++ b/tests/auto/testlib/selftests/alive/tst_alive.cpp

diff --git a/tests/auto/selftests/assert/assert.pro b/tests/auto/testlib/selftests/assert/assert.pro
index a1ed578a31a..a1ed578a31a 100644
--- a/tests/auto/selftests/assert/assert.pro
+++ b/tests/auto/testlib/selftests/assert/assert.pro

diff --git a/tests/auto/selftests/assert/tst_assert.cpp b/tests/auto/testlib/selftests/assert/tst_assert.cpp
index bd441629710..bd441629710 100644
--- a/tests/auto/selftests/assert/tst_assert.cpp
+++ b/tests/auto/testlib/selftests/assert/tst_assert.cpp

diff --git a/tests/auto/selftests/badxml/badxml.pro b/tests/auto/testlib/selftests/badxml/badxml.pro
index 126ac379d79..126ac379d79 100644
--- a/tests/auto/selftests/badxml/badxml.pro
+++ b/tests/auto/testlib/selftests/badxml/badxml.pro

diff --git a/tests/auto/selftests/badxml/tst_badxml.cpp b/tests/auto/testlib/selftests/badxml/tst_badxml.cpp
index 2d0b007df95..2d0b007df95 100644
--- a/tests/auto/selftests/badxml/tst_badxml.cpp
+++ b/tests/auto/testlib/selftests/badxml/tst_badxml.cpp

diff --git a/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro b/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro
index 50d056eae49..50d056eae49 100644
--- a/tests/auto/selftests/benchlibcallgrind/benchlibcallgrind.pro
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro

diff --git a/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
index 35054968299..35054968299 100644
--- a/tests/auto/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp
+++ b/tests/auto/testlib/selftests/benchlibcallgrind/tst_benchlibcallgrind.cpp

diff --git a/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro
index de978672f1a..de978672f1a 100644
--- a/tests/auto/selftests/benchlibeventcounter/benchlibeventcounter.pro
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro

diff --git a/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp
index ccb69ddb6a5..ccb69ddb6a5 100644
--- a/tests/auto/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp
+++ b/tests/auto/testlib/selftests/benchlibeventcounter/tst_benchlibeventcounter.cpp

diff --git a/tests/auto/selftests/benchliboptions/benchliboptions.pro b/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro
index 118563003f8..118563003f8 100644
--- a/tests/auto/selftests/benchliboptions/benchliboptions.pro
+++ b/tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro

diff --git a/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp
index cbe5af5ce84..cbe5af5ce84 100644
--- a/tests/auto/selftests/benchliboptions/tst_benchliboptions.cpp
+++ b/tests/auto/testlib/selftests/benchliboptions/tst_benchliboptions.cpp

diff --git a/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro b/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro
index b83ef441e16..b83ef441e16 100644
--- a/tests/auto/selftests/benchlibtickcounter/benchlibtickcounter.pro
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/benchlibtickcounter.pro

diff --git a/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp b/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp
index cc8b3a454fa..cc8b3a454fa 100644
--- a/tests/auto/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp
+++ b/tests/auto/testlib/selftests/benchlibtickcounter/tst_benchlibtickcounter.cpp

diff --git a/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro b/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro
index 83b383da87c..83b383da87c 100644
--- a/tests/auto/selftests/benchlibwalltime/benchlibwalltime.pro
+++ b/tests/auto/testlib/selftests/benchlibwalltime/benchlibwalltime.pro

diff --git a/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp b/tests/auto/testlib/selftests/benchlibwalltime/tst_benchlibwalltime.cpp
index 9042c27936f..9042c27936f 100644
--- a/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp
+++ b/tests/auto/testlib/selftests/benchlibwalltime/tst_benchlibwalltime.cpp

diff --git a/tests/auto/selftests/cmptest/cmptest.pro b/tests/auto/testlib/selftests/cmptest/cmptest.pro
index 9c149872050..9c149872050 100644
--- a/tests/auto/selftests/cmptest/cmptest.pro
+++ b/tests/auto/testlib/selftests/cmptest/cmptest.pro

diff --git a/tests/auto/selftests/cmptest/tst_cmptest.cpp b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp
index 4d38aa16465..4d38aa16465 100644
--- a/tests/auto/selftests/cmptest/tst_cmptest.cpp
+++ b/tests/auto/testlib/selftests/cmptest/tst_cmptest.cpp

diff --git a/tests/auto/selftests/commandlinedata/commandlinedata.pro b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro
index e10ec404b38..e10ec404b38 100644
--- a/tests/auto/selftests/commandlinedata/commandlinedata.pro
+++ b/tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro

diff --git a/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp b/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp
index 5f2dd3fffc2..5f2dd3fffc2 100644
--- a/tests/auto/selftests/commandlinedata/tst_commandlinedata.cpp
+++ b/tests/auto/testlib/selftests/commandlinedata/tst_commandlinedata.cpp

diff --git a/tests/auto/selftests/crashes/crashes.pro b/tests/auto/testlib/selftests/crashes/crashes.pro
index 8162e5ca0ac..8162e5ca0ac 100644
--- a/tests/auto/selftests/crashes/crashes.pro
+++ b/tests/auto/testlib/selftests/crashes/crashes.pro

diff --git a/tests/auto/selftests/crashes/tst_crashes.cpp b/tests/auto/testlib/selftests/crashes/tst_crashes.cpp
index d707414f5b5..d707414f5b5 100644
--- a/tests/auto/selftests/crashes/tst_crashes.cpp
+++ b/tests/auto/testlib/selftests/crashes/tst_crashes.cpp

diff --git a/tests/auto/selftests/datatable/datatable.pro b/tests/auto/testlib/selftests/datatable/datatable.pro
index 865e00e7f16..865e00e7f16 100644
--- a/tests/auto/selftests/datatable/datatable.pro
+++ b/tests/auto/testlib/selftests/datatable/datatable.pro

diff --git a/tests/auto/selftests/datatable/tst_datatable.cpp b/tests/auto/testlib/selftests/datatable/tst_datatable.cpp
index a55e9cbae26..a55e9cbae26 100644
--- a/tests/auto/selftests/datatable/tst_datatable.cpp
+++ b/tests/auto/testlib/selftests/datatable/tst_datatable.cpp

diff --git a/tests/auto/selftests/datetime/datetime.pro b/tests/auto/testlib/selftests/datetime/datetime.pro
index 34d61695388..34d61695388 100644
--- a/tests/auto/selftests/datetime/datetime.pro
+++ b/tests/auto/testlib/selftests/datetime/datetime.pro

diff --git a/tests/auto/selftests/datetime/tst_datetime.cpp b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp
index 64126644db2..64126644db2 100644
--- a/tests/auto/selftests/datetime/tst_datetime.cpp
+++ b/tests/auto/testlib/selftests/datetime/tst_datetime.cpp

diff --git a/tests/auto/selftests/differentexec/differentexec.pro b/tests/auto/testlib/selftests/differentexec/differentexec.pro
index 84e20eec035..84e20eec035 100644
--- a/tests/auto/selftests/differentexec/differentexec.pro
+++ b/tests/auto/testlib/selftests/differentexec/differentexec.pro

diff --git a/tests/auto/selftests/differentexec/tst_differentexec.cpp b/tests/auto/testlib/selftests/differentexec/tst_differentexec.cpp
index 5061369776a..5061369776a 100644
--- a/tests/auto/selftests/differentexec/tst_differentexec.cpp
+++ b/tests/auto/testlib/selftests/differentexec/tst_differentexec.cpp

diff --git a/tests/auto/selftests/exceptionthrow/exceptionthrow.pro b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro
index 62c782f6be4..62c782f6be4 100644
--- a/tests/auto/selftests/exceptionthrow/exceptionthrow.pro
+++ b/tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro

diff --git a/tests/auto/selftests/exceptionthrow/tst_exceptionthrow.cpp b/tests/auto/testlib/selftests/exceptionthrow/tst_exceptionthrow.cpp
index 23cc89ca61e..23cc89ca61e 100644
--- a/tests/auto/selftests/exceptionthrow/tst_exceptionthrow.cpp
+++ b/tests/auto/testlib/selftests/exceptionthrow/tst_exceptionthrow.cpp

diff --git a/tests/auto/selftests/expected_alive.txt b/tests/auto/testlib/selftests/expected_alive.txt
index e1768ec8815..e1768ec8815 100644
--- a/tests/auto/selftests/expected_alive.txt
+++ b/tests/auto/testlib/selftests/expected_alive.txt

diff --git a/tests/auto/selftests/expected_assert.lightxml b/tests/auto/testlib/selftests/expected_assert.lightxml
index c9a1978e9e6..c9a1978e9e6 100644
--- a/tests/auto/selftests/expected_assert.lightxml
+++ b/tests/auto/testlib/selftests/expected_assert.lightxml

diff --git a/tests/auto/selftests/expected_assert.txt b/tests/auto/testlib/selftests/expected_assert.txt
index f57eb55604a..f57eb55604a 100644
--- a/tests/auto/selftests/expected_assert.txt
+++ b/tests/auto/testlib/selftests/expected_assert.txt

diff --git a/tests/auto/selftests/expected_assert.xml b/tests/auto/testlib/selftests/expected_assert.xml
index 60085aa2b9a..60085aa2b9a 100644
--- a/tests/auto/selftests/expected_assert.xml
+++ b/tests/auto/testlib/selftests/expected_assert.xml

diff --git a/tests/auto/selftests/expected_assert.xunitxml b/tests/auto/testlib/selftests/expected_assert.xunitxml
index 87617003c5c..87617003c5c 100644
--- a/tests/auto/selftests/expected_assert.xunitxml
+++ b/tests/auto/testlib/selftests/expected_assert.xunitxml

diff --git a/tests/auto/selftests/expected_badxml.lightxml b/tests/auto/testlib/selftests/expected_badxml.lightxml
index 19bec33e1e0..19bec33e1e0 100644
--- a/tests/auto/selftests/expected_badxml.lightxml
+++ b/tests/auto/testlib/selftests/expected_badxml.lightxml

diff --git a/tests/auto/selftests/expected_badxml.txt b/tests/auto/testlib/selftests/expected_badxml.txt
index bc9d203678e..bc9d203678e 100644
--- a/tests/auto/selftests/expected_badxml.txt
+++ b/tests/auto/testlib/selftests/expected_badxml.txt

diff --git a/tests/auto/selftests/expected_badxml.xml b/tests/auto/testlib/selftests/expected_badxml.xml
index a33c8d251e0..a33c8d251e0 100644
--- a/tests/auto/selftests/expected_badxml.xml
+++ b/tests/auto/testlib/selftests/expected_badxml.xml

diff --git a/tests/auto/selftests/expected_badxml.xunitxml b/tests/auto/testlib/selftests/expected_badxml.xunitxml
index 724aed59e74..724aed59e74 100644
--- a/tests/auto/selftests/expected_badxml.xunitxml
+++ b/tests/auto/testlib/selftests/expected_badxml.xunitxml

diff --git a/tests/auto/selftests/expected_benchlibcallgrind.lightxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml
index c2394e545e8..c2394e545e8 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.lightxml

diff --git a/tests/auto/selftests/expected_benchlibcallgrind.txt b/tests/auto/testlib/selftests/expected_benchlibcallgrind.txt
index f1727114b54..f1727114b54 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.txt
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.txt

diff --git a/tests/auto/selftests/expected_benchlibcallgrind.xml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xml
index b29b9c569ea..b29b9c569ea 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xml

diff --git a/tests/auto/selftests/expected_benchlibcallgrind.xunitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml
index cc58f7fdd45..cc58f7fdd45 100644
--- a/tests/auto/selftests/expected_benchlibcallgrind.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.xunitxml

diff --git a/tests/auto/selftests/expected_benchlibeventcounter.lightxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml
index 3bede6de838..3bede6de838 100644
--- a/tests/auto/selftests/expected_benchlibeventcounter.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.lightxml

diff --git a/tests/auto/selftests/expected_benchlibeventcounter.txt b/tests/auto/testlib/selftests/expected_benchlibeventcounter.txt
index 906a4dea801..906a4dea801 100644
--- a/tests/auto/selftests/expected_benchlibeventcounter.txt
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.txt

diff --git a/tests/auto/selftests/expected_benchlibeventcounter.xml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml
index 646cf22b804..646cf22b804 100644
--- a/tests/auto/selftests/expected_benchlibeventcounter.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xml

diff --git a/tests/auto/selftests/expected_benchlibeventcounter.xunitxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml
index 60dca28d4fd..60dca28d4fd 100644
--- a/tests/auto/selftests/expected_benchlibeventcounter.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.xunitxml

diff --git a/tests/auto/selftests/expected_benchliboptions.lightxml b/tests/auto/testlib/selftests/expected_benchliboptions.lightxml
index 63d0218b2c1..63d0218b2c1 100644
--- a/tests/auto/selftests/expected_benchliboptions.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchliboptions.lightxml

diff --git a/tests/auto/selftests/expected_benchliboptions.txt b/tests/auto/testlib/selftests/expected_benchliboptions.txt
index 7afc922630a..7afc922630a 100644
--- a/tests/auto/selftests/expected_benchliboptions.txt
+++ b/tests/auto/testlib/selftests/expected_benchliboptions.txt

diff --git a/tests/auto/selftests/expected_benchliboptions.xml b/tests/auto/testlib/selftests/expected_benchliboptions.xml
index 40bff95f798..40bff95f798 100644
--- a/tests/auto/selftests/expected_benchliboptions.xml
+++ b/tests/auto/testlib/selftests/expected_benchliboptions.xml

diff --git a/tests/auto/selftests/expected_benchliboptions.xunitxml b/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml
index 7317e90470d..7317e90470d 100644
--- a/tests/auto/selftests/expected_benchliboptions.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchliboptions.xunitxml

diff --git a/tests/auto/selftests/expected_benchlibtickcounter.lightxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml
index 845fd9c161b..845fd9c161b 100644
--- a/tests/auto/selftests/expected_benchlibtickcounter.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.lightxml

diff --git a/tests/auto/selftests/expected_benchlibtickcounter.txt b/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt
index 4cdeeee9065..4cdeeee9065 100644
--- a/tests/auto/selftests/expected_benchlibtickcounter.txt
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.txt

diff --git a/tests/auto/selftests/expected_benchlibtickcounter.xml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml
index 3cd82a2b1a2..3cd82a2b1a2 100644
--- a/tests/auto/selftests/expected_benchlibtickcounter.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xml

diff --git a/tests/auto/selftests/expected_benchlibtickcounter.xunitxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml
index 28c8f111431..28c8f111431 100644
--- a/tests/auto/selftests/expected_benchlibtickcounter.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.xunitxml

diff --git a/tests/auto/selftests/expected_benchlibwalltime.lightxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml
index f1d89328efd..f1d89328efd 100644
--- a/tests/auto/selftests/expected_benchlibwalltime.lightxml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.lightxml

diff --git a/tests/auto/selftests/expected_benchlibwalltime.txt b/tests/auto/testlib/selftests/expected_benchlibwalltime.txt
index ec2d020406c..ec2d020406c 100644
--- a/tests/auto/selftests/expected_benchlibwalltime.txt
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.txt

diff --git a/tests/auto/selftests/expected_benchlibwalltime.xml b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml
index 1379d4bcc97..1379d4bcc97 100644
--- a/tests/auto/selftests/expected_benchlibwalltime.xml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.xml

diff --git a/tests/auto/selftests/expected_benchlibwalltime.xunitxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml
index e4ffca4d095..e4ffca4d095 100644
--- a/tests/auto/selftests/expected_benchlibwalltime.xunitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.xunitxml

diff --git a/tests/auto/selftests/expected_cmptest.lightxml b/tests/auto/testlib/selftests/expected_cmptest.lightxml
index 72d1caf5f8f..72d1caf5f8f 100644
--- a/tests/auto/selftests/expected_cmptest.lightxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.lightxml

diff --git a/tests/auto/selftests/expected_cmptest.txt b/tests/auto/testlib/selftests/expected_cmptest.txt
index df46703afa2..df46703afa2 100644
--- a/tests/auto/selftests/expected_cmptest.txt
+++ b/tests/auto/testlib/selftests/expected_cmptest.txt

diff --git a/tests/auto/selftests/expected_cmptest.xml b/tests/auto/testlib/selftests/expected_cmptest.xml
index 7064fcb1d07..7064fcb1d07 100644
--- a/tests/auto/selftests/expected_cmptest.xml
+++ b/tests/auto/testlib/selftests/expected_cmptest.xml

diff --git a/tests/auto/selftests/expected_cmptest.xunitxml b/tests/auto/testlib/selftests/expected_cmptest.xunitxml
index 01bfda8d010..01bfda8d010 100644
--- a/tests/auto/selftests/expected_cmptest.xunitxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.xunitxml

diff --git a/tests/auto/selftests/expected_commandlinedata.lightxml b/tests/auto/testlib/selftests/expected_commandlinedata.lightxml
index 6907b7211fd..6907b7211fd 100644
--- a/tests/auto/selftests/expected_commandlinedata.lightxml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.lightxml

diff --git a/tests/auto/selftests/expected_commandlinedata.txt b/tests/auto/testlib/selftests/expected_commandlinedata.txt
index b79f491fe79..b79f491fe79 100644
--- a/tests/auto/selftests/expected_commandlinedata.txt
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.txt

diff --git a/tests/auto/selftests/expected_commandlinedata.xml b/tests/auto/testlib/selftests/expected_commandlinedata.xml
index bcc8cbdbb7f..bcc8cbdbb7f 100644
--- a/tests/auto/selftests/expected_commandlinedata.xml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.xml

diff --git a/tests/auto/selftests/expected_commandlinedata.xunitxml b/tests/auto/testlib/selftests/expected_commandlinedata.xunitxml
index 45b833cf190..45b833cf190 100644
--- a/tests/auto/selftests/expected_commandlinedata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.xunitxml

diff --git a/tests/auto/selftests/expected_crashes.lightxml b/tests/auto/testlib/selftests/expected_crashes.lightxml
index 76890deb75d..76890deb75d 100644
--- a/tests/auto/selftests/expected_crashes.lightxml
+++ b/tests/auto/testlib/selftests/expected_crashes.lightxml

diff --git a/tests/auto/selftests/expected_crashes.xml b/tests/auto/testlib/selftests/expected_crashes.xml
index be01e633e9e..be01e633e9e 100644
--- a/tests/auto/selftests/expected_crashes.xml
+++ b/tests/auto/testlib/selftests/expected_crashes.xml

diff --git a/tests/auto/selftests/expected_crashes.xunitxml b/tests/auto/testlib/selftests/expected_crashes.xunitxml
index 558491c5987..558491c5987 100644
--- a/tests/auto/selftests/expected_crashes.xunitxml
+++ b/tests/auto/testlib/selftests/expected_crashes.xunitxml

diff --git a/tests/auto/selftests/expected_crashes_1.txt b/tests/auto/testlib/selftests/expected_crashes_1.txt
index 887a11713ea..887a11713ea 100644
--- a/tests/auto/selftests/expected_crashes_1.txt
+++ b/tests/auto/testlib/selftests/expected_crashes_1.txt

diff --git a/tests/auto/selftests/expected_crashes_2.txt b/tests/auto/testlib/selftests/expected_crashes_2.txt
index e5eb5aac6af..e5eb5aac6af 100644
--- a/tests/auto/selftests/expected_crashes_2.txt
+++ b/tests/auto/testlib/selftests/expected_crashes_2.txt

diff --git a/tests/auto/selftests/expected_crashes_3.txt b/tests/auto/testlib/selftests/expected_crashes_3.txt
index 1735aeba23e..1735aeba23e 100644
--- a/tests/auto/selftests/expected_crashes_3.txt
+++ b/tests/auto/testlib/selftests/expected_crashes_3.txt

diff --git a/tests/auto/selftests/expected_datatable.lightxml b/tests/auto/testlib/selftests/expected_datatable.lightxml
index e14d1e2abb8..e14d1e2abb8 100644
--- a/tests/auto/selftests/expected_datatable.lightxml
+++ b/tests/auto/testlib/selftests/expected_datatable.lightxml

diff --git a/tests/auto/selftests/expected_datatable.txt b/tests/auto/testlib/selftests/expected_datatable.txt
index 6fac9daff70..6fac9daff70 100644
--- a/tests/auto/selftests/expected_datatable.txt
+++ b/tests/auto/testlib/selftests/expected_datatable.txt

diff --git a/tests/auto/selftests/expected_datatable.xml b/tests/auto/testlib/selftests/expected_datatable.xml
index 0d12594a09d..0d12594a09d 100644
--- a/tests/auto/selftests/expected_datatable.xml
+++ b/tests/auto/testlib/selftests/expected_datatable.xml

diff --git a/tests/auto/selftests/expected_datatable.xunitxml b/tests/auto/testlib/selftests/expected_datatable.xunitxml
index 6bac80e0a2a..6bac80e0a2a 100644
--- a/tests/auto/selftests/expected_datatable.xunitxml
+++ b/tests/auto/testlib/selftests/expected_datatable.xunitxml

diff --git a/tests/auto/selftests/expected_datetime.lightxml b/tests/auto/testlib/selftests/expected_datetime.lightxml
index 49f8546e6a1..49f8546e6a1 100644
--- a/tests/auto/selftests/expected_datetime.lightxml
+++ b/tests/auto/testlib/selftests/expected_datetime.lightxml

diff --git a/tests/auto/selftests/expected_datetime.txt b/tests/auto/testlib/selftests/expected_datetime.txt
index d745aa04f5f..d745aa04f5f 100644
--- a/tests/auto/selftests/expected_datetime.txt
+++ b/tests/auto/testlib/selftests/expected_datetime.txt

diff --git a/tests/auto/selftests/expected_datetime.xml b/tests/auto/testlib/selftests/expected_datetime.xml
index b7b870e6786..b7b870e6786 100644
--- a/tests/auto/selftests/expected_datetime.xml
+++ b/tests/auto/testlib/selftests/expected_datetime.xml

diff --git a/tests/auto/selftests/expected_datetime.xunitxml b/tests/auto/testlib/selftests/expected_datetime.xunitxml
index b30d1c441f7..b30d1c441f7 100644
--- a/tests/auto/selftests/expected_datetime.xunitxml
+++ b/tests/auto/testlib/selftests/expected_datetime.xunitxml

diff --git a/tests/auto/selftests/expected_differentexec.txt b/tests/auto/testlib/selftests/expected_differentexec.txt
index 9536b69c870..9536b69c870 100644
--- a/tests/auto/selftests/expected_differentexec.txt
+++ b/tests/auto/testlib/selftests/expected_differentexec.txt

diff --git a/tests/auto/selftests/expected_exceptionthrow.lightxml b/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml
index 0b8de0a6ba5..0b8de0a6ba5 100644
--- a/tests/auto/selftests/expected_exceptionthrow.lightxml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.lightxml

diff --git a/tests/auto/selftests/expected_exceptionthrow.txt b/tests/auto/testlib/selftests/expected_exceptionthrow.txt
index 141ea8be778..141ea8be778 100644
--- a/tests/auto/selftests/expected_exceptionthrow.txt
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.txt

diff --git a/tests/auto/selftests/expected_exceptionthrow.xml b/tests/auto/testlib/selftests/expected_exceptionthrow.xml
index bddbb7d7b6e..bddbb7d7b6e 100644
--- a/tests/auto/selftests/expected_exceptionthrow.xml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.xml

diff --git a/tests/auto/selftests/expected_exceptionthrow.xunitxml b/tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml
index ab0d3792559..ab0d3792559 100644
--- a/tests/auto/selftests/expected_exceptionthrow.xunitxml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.xunitxml

diff --git a/tests/auto/selftests/expected_expectfail.lightxml b/tests/auto/testlib/selftests/expected_expectfail.lightxml
index 003b8e866d4..003b8e866d4 100644
--- a/tests/auto/selftests/expected_expectfail.lightxml
+++ b/tests/auto/testlib/selftests/expected_expectfail.lightxml

diff --git a/tests/auto/selftests/expected_expectfail.txt b/tests/auto/testlib/selftests/expected_expectfail.txt
index 2eee7ffd759..2eee7ffd759 100644
--- a/tests/auto/selftests/expected_expectfail.txt
+++ b/tests/auto/testlib/selftests/expected_expectfail.txt

diff --git a/tests/auto/selftests/expected_expectfail.xml b/tests/auto/testlib/selftests/expected_expectfail.xml
index 670467eb072..670467eb072 100644
--- a/tests/auto/selftests/expected_expectfail.xml
+++ b/tests/auto/testlib/selftests/expected_expectfail.xml

diff --git a/tests/auto/selftests/expected_expectfail.xunitxml b/tests/auto/testlib/selftests/expected_expectfail.xunitxml
index 32a5cfca81d..32a5cfca81d 100644
--- a/tests/auto/selftests/expected_expectfail.xunitxml
+++ b/tests/auto/testlib/selftests/expected_expectfail.xunitxml

diff --git a/tests/auto/selftests/expected_failinit.lightxml b/tests/auto/testlib/selftests/expected_failinit.lightxml
index 0edf225bf19..0edf225bf19 100644
--- a/tests/auto/selftests/expected_failinit.lightxml
+++ b/tests/auto/testlib/selftests/expected_failinit.lightxml

diff --git a/tests/auto/selftests/expected_failinit.txt b/tests/auto/testlib/selftests/expected_failinit.txt
index 6f848988dea..6f848988dea 100644
--- a/tests/auto/selftests/expected_failinit.txt
+++ b/tests/auto/testlib/selftests/expected_failinit.txt

diff --git a/tests/auto/selftests/expected_failinit.xml b/tests/auto/testlib/selftests/expected_failinit.xml
index e1f9e8d0691..e1f9e8d0691 100644
--- a/tests/auto/selftests/expected_failinit.xml
+++ b/tests/auto/testlib/selftests/expected_failinit.xml

diff --git a/tests/auto/selftests/expected_failinit.xunitxml b/tests/auto/testlib/selftests/expected_failinit.xunitxml
index 3c2e31be298..3c2e31be298 100644
--- a/tests/auto/selftests/expected_failinit.xunitxml
+++ b/tests/auto/testlib/selftests/expected_failinit.xunitxml

diff --git a/tests/auto/selftests/expected_failinitdata.lightxml b/tests/auto/testlib/selftests/expected_failinitdata.lightxml
index 56d8c71ba61..56d8c71ba61 100644
--- a/tests/auto/selftests/expected_failinitdata.lightxml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.lightxml

diff --git a/tests/auto/selftests/expected_failinitdata.txt b/tests/auto/testlib/selftests/expected_failinitdata.txt
index c74308f7af5..c74308f7af5 100644
--- a/tests/auto/selftests/expected_failinitdata.txt
+++ b/tests/auto/testlib/selftests/expected_failinitdata.txt

diff --git a/tests/auto/selftests/expected_failinitdata.xml b/tests/auto/testlib/selftests/expected_failinitdata.xml
index 47be1b6726d..47be1b6726d 100644
--- a/tests/auto/selftests/expected_failinitdata.xml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.xml

diff --git a/tests/auto/selftests/expected_failinitdata.xunitxml b/tests/auto/testlib/selftests/expected_failinitdata.xunitxml
index f32ccd5e814..f32ccd5e814 100644
--- a/tests/auto/selftests/expected_failinitdata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.xunitxml

diff --git a/tests/auto/selftests/expected_fatal.txt b/tests/auto/testlib/selftests/expected_fatal.txt
index c8ab3d6ee3a..c8ab3d6ee3a 100644
--- a/tests/auto/selftests/expected_fatal.txt
+++ b/tests/auto/testlib/selftests/expected_fatal.txt

diff --git a/tests/auto/selftests/expected_fetchbogus.lightxml b/tests/auto/testlib/selftests/expected_fetchbogus.lightxml
index 1812c0e6b50..1812c0e6b50 100644
--- a/tests/auto/selftests/expected_fetchbogus.lightxml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.lightxml

diff --git a/tests/auto/selftests/expected_fetchbogus.txt b/tests/auto/testlib/selftests/expected_fetchbogus.txt
index 22f8d1becac..22f8d1becac 100644
--- a/tests/auto/selftests/expected_fetchbogus.txt
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.txt

diff --git a/tests/auto/selftests/expected_fetchbogus.xml b/tests/auto/testlib/selftests/expected_fetchbogus.xml
index 7daa065e3dd..7daa065e3dd 100644
--- a/tests/auto/selftests/expected_fetchbogus.xml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.xml

diff --git a/tests/auto/selftests/expected_fetchbogus.xunitxml b/tests/auto/testlib/selftests/expected_fetchbogus.xunitxml
index fe31b4b6009..fe31b4b6009 100644
--- a/tests/auto/selftests/expected_fetchbogus.xunitxml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.xunitxml

diff --git a/tests/auto/selftests/expected_globaldata.lightxml b/tests/auto/testlib/selftests/expected_globaldata.lightxml
index c4db4bc90c2..c4db4bc90c2 100644
--- a/tests/auto/selftests/expected_globaldata.lightxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.lightxml

diff --git a/tests/auto/selftests/expected_globaldata.txt b/tests/auto/testlib/selftests/expected_globaldata.txt
index 983376b261f..983376b261f 100644
--- a/tests/auto/selftests/expected_globaldata.txt
+++ b/tests/auto/testlib/selftests/expected_globaldata.txt

diff --git a/tests/auto/selftests/expected_globaldata.xml b/tests/auto/testlib/selftests/expected_globaldata.xml
index ea4beb1886f..ea4beb1886f 100644
--- a/tests/auto/selftests/expected_globaldata.xml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xml

diff --git a/tests/auto/selftests/expected_globaldata.xunitxml b/tests/auto/testlib/selftests/expected_globaldata.xunitxml
index d88fdbffa60..d88fdbffa60 100644
--- a/tests/auto/selftests/expected_globaldata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xunitxml

diff --git a/tests/auto/selftests/expected_longstring.lightxml b/tests/auto/testlib/selftests/expected_longstring.lightxml
index 945a9f3d943..945a9f3d943 100644
--- a/tests/auto/selftests/expected_longstring.lightxml
+++ b/tests/auto/testlib/selftests/expected_longstring.lightxml

diff --git a/tests/auto/selftests/expected_longstring.txt b/tests/auto/testlib/selftests/expected_longstring.txt
index 443c6572b0c..443c6572b0c 100644
--- a/tests/auto/selftests/expected_longstring.txt
+++ b/tests/auto/testlib/selftests/expected_longstring.txt

diff --git a/tests/auto/selftests/expected_longstring.xml b/tests/auto/testlib/selftests/expected_longstring.xml
index 45ad2862fd4..45ad2862fd4 100644
--- a/tests/auto/selftests/expected_longstring.xml
+++ b/tests/auto/testlib/selftests/expected_longstring.xml

diff --git a/tests/auto/selftests/expected_longstring.xunitxml b/tests/auto/testlib/selftests/expected_longstring.xunitxml
index 6486817dbb4..6486817dbb4 100644
--- a/tests/auto/selftests/expected_longstring.xunitxml
+++ b/tests/auto/testlib/selftests/expected_longstring.xunitxml

diff --git a/tests/auto/selftests/expected_maxwarnings.lightxml b/tests/auto/testlib/selftests/expected_maxwarnings.lightxml
index 054108fe6d4..054108fe6d4 100644
--- a/tests/auto/selftests/expected_maxwarnings.lightxml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.lightxml

diff --git a/tests/auto/selftests/expected_maxwarnings.txt b/tests/auto/testlib/selftests/expected_maxwarnings.txt
index 901350b741e..901350b741e 100644
--- a/tests/auto/selftests/expected_maxwarnings.txt
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.txt

diff --git a/tests/auto/selftests/expected_maxwarnings.xml b/tests/auto/testlib/selftests/expected_maxwarnings.xml
index 2c3736e2638..2c3736e2638 100644
--- a/tests/auto/selftests/expected_maxwarnings.xml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.xml

diff --git a/tests/auto/selftests/expected_maxwarnings.xunitxml b/tests/auto/testlib/selftests/expected_maxwarnings.xunitxml
index b1b0215cef5..b1b0215cef5 100644
--- a/tests/auto/selftests/expected_maxwarnings.xunitxml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.xunitxml

diff --git a/tests/auto/selftests/expected_multiexec.lightxml b/tests/auto/testlib/selftests/expected_multiexec.lightxml
index 1a66e92f8f9..1a66e92f8f9 100644
--- a/tests/auto/selftests/expected_multiexec.lightxml
+++ b/tests/auto/testlib/selftests/expected_multiexec.lightxml

diff --git a/tests/auto/selftests/expected_multiexec.txt b/tests/auto/testlib/selftests/expected_multiexec.txt
index 11d7a909a26..11d7a909a26 100644
--- a/tests/auto/selftests/expected_multiexec.txt
+++ b/tests/auto/testlib/selftests/expected_multiexec.txt

diff --git a/tests/auto/selftests/expected_multiexec.xml b/tests/auto/testlib/selftests/expected_multiexec.xml
index 7f71f6edaca..7f71f6edaca 100644
--- a/tests/auto/selftests/expected_multiexec.xml
+++ b/tests/auto/testlib/selftests/expected_multiexec.xml

diff --git a/tests/auto/selftests/expected_multiexec.xunitxml b/tests/auto/testlib/selftests/expected_multiexec.xunitxml
index 6bc04c3ddda..6bc04c3ddda 100644
--- a/tests/auto/selftests/expected_multiexec.xunitxml
+++ b/tests/auto/testlib/selftests/expected_multiexec.xunitxml

diff --git a/tests/auto/selftests/expected_qexecstringlist.txt b/tests/auto/testlib/selftests/expected_qexecstringlist.txt
index e6c8f00ae3d..e6c8f00ae3d 100644
--- a/tests/auto/selftests/expected_qexecstringlist.txt
+++ b/tests/auto/testlib/selftests/expected_qexecstringlist.txt

diff --git a/tests/auto/selftests/expected_singleskip.lightxml b/tests/auto/testlib/selftests/expected_singleskip.lightxml
index bcddcae004f..bcddcae004f 100644
--- a/tests/auto/selftests/expected_singleskip.lightxml
+++ b/tests/auto/testlib/selftests/expected_singleskip.lightxml

diff --git a/tests/auto/selftests/expected_singleskip.txt b/tests/auto/testlib/selftests/expected_singleskip.txt
index 19cb797dbad..19cb797dbad 100644
--- a/tests/auto/selftests/expected_singleskip.txt
+++ b/tests/auto/testlib/selftests/expected_singleskip.txt

diff --git a/tests/auto/selftests/expected_singleskip.xml b/tests/auto/testlib/selftests/expected_singleskip.xml
index 483863ec913..483863ec913 100644
--- a/tests/auto/selftests/expected_singleskip.xml
+++ b/tests/auto/testlib/selftests/expected_singleskip.xml

diff --git a/tests/auto/selftests/expected_singleskip.xunitxml b/tests/auto/testlib/selftests/expected_singleskip.xunitxml
index 70968fa1c40..70968fa1c40 100644
--- a/tests/auto/selftests/expected_singleskip.xunitxml
+++ b/tests/auto/testlib/selftests/expected_singleskip.xunitxml

diff --git a/tests/auto/selftests/expected_skip.lightxml b/tests/auto/testlib/selftests/expected_skip.lightxml
index 61cfe7db72f..61cfe7db72f 100644
--- a/tests/auto/selftests/expected_skip.lightxml
+++ b/tests/auto/testlib/selftests/expected_skip.lightxml

diff --git a/tests/auto/selftests/expected_skip.txt b/tests/auto/testlib/selftests/expected_skip.txt
index 42f89a7cda9..42f89a7cda9 100644
--- a/tests/auto/selftests/expected_skip.txt
+++ b/tests/auto/testlib/selftests/expected_skip.txt

diff --git a/tests/auto/selftests/expected_skip.xml b/tests/auto/testlib/selftests/expected_skip.xml
index 3c7b1073c81..3c7b1073c81 100644
--- a/tests/auto/selftests/expected_skip.xml
+++ b/tests/auto/testlib/selftests/expected_skip.xml

diff --git a/tests/auto/selftests/expected_skip.xunitxml b/tests/auto/testlib/selftests/expected_skip.xunitxml
index 956d51f5313..956d51f5313 100644
--- a/tests/auto/selftests/expected_skip.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skip.xunitxml

diff --git a/tests/auto/selftests/expected_skipglobal.lightxml b/tests/auto/testlib/selftests/expected_skipglobal.lightxml
index 66084fc1e8a..66084fc1e8a 100644
--- a/tests/auto/selftests/expected_skipglobal.lightxml
+++ b/tests/auto/testlib/selftests/expected_skipglobal.lightxml

diff --git a/tests/auto/selftests/expected_skipglobal.txt b/tests/auto/testlib/selftests/expected_skipglobal.txt
index dcd6c442dcd..dcd6c442dcd 100644
--- a/tests/auto/selftests/expected_skipglobal.txt
+++ b/tests/auto/testlib/selftests/expected_skipglobal.txt

diff --git a/tests/auto/selftests/expected_skipglobal.xml b/tests/auto/testlib/selftests/expected_skipglobal.xml
index 4d25bc94609..4d25bc94609 100644
--- a/tests/auto/selftests/expected_skipglobal.xml
+++ b/tests/auto/testlib/selftests/expected_skipglobal.xml

diff --git a/tests/auto/selftests/expected_skipglobal.xunitxml b/tests/auto/testlib/selftests/expected_skipglobal.xunitxml
index cc43ec86140..cc43ec86140 100644
--- a/tests/auto/selftests/expected_skipglobal.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skipglobal.xunitxml

diff --git a/tests/auto/selftests/expected_skipinit.lightxml b/tests/auto/testlib/selftests/expected_skipinit.lightxml
index 005169e7e6b..005169e7e6b 100644
--- a/tests/auto/selftests/expected_skipinit.lightxml
+++ b/tests/auto/testlib/selftests/expected_skipinit.lightxml

diff --git a/tests/auto/selftests/expected_skipinit.txt b/tests/auto/testlib/selftests/expected_skipinit.txt
index a1567859bbd..a1567859bbd 100644
--- a/tests/auto/selftests/expected_skipinit.txt
+++ b/tests/auto/testlib/selftests/expected_skipinit.txt

diff --git a/tests/auto/selftests/expected_skipinit.xml b/tests/auto/testlib/selftests/expected_skipinit.xml
index 5118fd1cb01..5118fd1cb01 100644
--- a/tests/auto/selftests/expected_skipinit.xml
+++ b/tests/auto/testlib/selftests/expected_skipinit.xml

diff --git a/tests/auto/selftests/expected_skipinit.xunitxml b/tests/auto/testlib/selftests/expected_skipinit.xunitxml
index f62df71d96f..f62df71d96f 100644
--- a/tests/auto/selftests/expected_skipinit.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skipinit.xunitxml

diff --git a/tests/auto/selftests/expected_skipinitdata.lightxml b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml
index bac851ec256..bac851ec256 100644
--- a/tests/auto/selftests/expected_skipinitdata.lightxml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.lightxml

diff --git a/tests/auto/selftests/expected_skipinitdata.txt b/tests/auto/testlib/selftests/expected_skipinitdata.txt
index 11ca438f3ae..11ca438f3ae 100644
--- a/tests/auto/selftests/expected_skipinitdata.txt
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.txt

diff --git a/tests/auto/selftests/expected_skipinitdata.xml b/tests/auto/testlib/selftests/expected_skipinitdata.xml
index 05e57b1ab32..05e57b1ab32 100644
--- a/tests/auto/selftests/expected_skipinitdata.xml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.xml

diff --git a/tests/auto/selftests/expected_skipinitdata.xunitxml b/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml
index 93967eb0559..93967eb0559 100644
--- a/tests/auto/selftests/expected_skipinitdata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.xunitxml

diff --git a/tests/auto/selftests/expected_sleep.lightxml b/tests/auto/testlib/selftests/expected_sleep.lightxml
index 1a056c85629..1a056c85629 100644
--- a/tests/auto/selftests/expected_sleep.lightxml
+++ b/tests/auto/testlib/selftests/expected_sleep.lightxml

diff --git a/tests/auto/selftests/expected_sleep.txt b/tests/auto/testlib/selftests/expected_sleep.txt
index 67f1f2f659d..67f1f2f659d 100644
--- a/tests/auto/selftests/expected_sleep.txt
+++ b/tests/auto/testlib/selftests/expected_sleep.txt

diff --git a/tests/auto/selftests/expected_sleep.xml b/tests/auto/testlib/selftests/expected_sleep.xml
index cbc4d140048..cbc4d140048 100644
--- a/tests/auto/selftests/expected_sleep.xml
+++ b/tests/auto/testlib/selftests/expected_sleep.xml

diff --git a/tests/auto/selftests/expected_sleep.xunitxml b/tests/auto/testlib/selftests/expected_sleep.xunitxml
index 409621e6bc1..409621e6bc1 100644
--- a/tests/auto/selftests/expected_sleep.xunitxml
+++ b/tests/auto/testlib/selftests/expected_sleep.xunitxml

diff --git a/tests/auto/selftests/expected_strcmp.lightxml b/tests/auto/testlib/selftests/expected_strcmp.lightxml
index 28dc9335ec5..28dc9335ec5 100644
--- a/tests/auto/selftests/expected_strcmp.lightxml
+++ b/tests/auto/testlib/selftests/expected_strcmp.lightxml

diff --git a/tests/auto/selftests/expected_strcmp.txt b/tests/auto/testlib/selftests/expected_strcmp.txt
index c739d94943d..c739d94943d 100644
--- a/tests/auto/selftests/expected_strcmp.txt
+++ b/tests/auto/testlib/selftests/expected_strcmp.txt

diff --git a/tests/auto/selftests/expected_strcmp.xml b/tests/auto/testlib/selftests/expected_strcmp.xml
index 13fe7724313..13fe7724313 100644
--- a/tests/auto/selftests/expected_strcmp.xml
+++ b/tests/auto/testlib/selftests/expected_strcmp.xml

diff --git a/tests/auto/selftests/expected_strcmp.xunitxml b/tests/auto/testlib/selftests/expected_strcmp.xunitxml
index c2b694b8bb5..c2b694b8bb5 100644
--- a/tests/auto/selftests/expected_strcmp.xunitxml
+++ b/tests/auto/testlib/selftests/expected_strcmp.xunitxml

diff --git a/tests/auto/selftests/expected_subtest.lightxml b/tests/auto/testlib/selftests/expected_subtest.lightxml
index 00c1a992bde..00c1a992bde 100644
--- a/tests/auto/selftests/expected_subtest.lightxml
+++ b/tests/auto/testlib/selftests/expected_subtest.lightxml

diff --git a/tests/auto/selftests/expected_subtest.txt b/tests/auto/testlib/selftests/expected_subtest.txt
index ec459c5b59e..ec459c5b59e 100644
--- a/tests/auto/selftests/expected_subtest.txt
+++ b/tests/auto/testlib/selftests/expected_subtest.txt

diff --git a/tests/auto/selftests/expected_subtest.xml b/tests/auto/testlib/selftests/expected_subtest.xml
index 5ecb0a2e9f6..5ecb0a2e9f6 100644
--- a/tests/auto/selftests/expected_subtest.xml
+++ b/tests/auto/testlib/selftests/expected_subtest.xml

diff --git a/tests/auto/selftests/expected_subtest.xunitxml b/tests/auto/testlib/selftests/expected_subtest.xunitxml
index a5f75fe73e7..a5f75fe73e7 100644
--- a/tests/auto/selftests/expected_subtest.xunitxml
+++ b/tests/auto/testlib/selftests/expected_subtest.xunitxml

diff --git a/tests/auto/selftests/expected_waitwithoutgui.lightxml b/tests/auto/testlib/selftests/expected_waitwithoutgui.lightxml
index e69de29bb2d..e69de29bb2d 100644
--- a/tests/auto/selftests/expected_waitwithoutgui.lightxml
+++ b/tests/auto/testlib/selftests/expected_waitwithoutgui.lightxml

diff --git a/tests/auto/selftests/expected_waitwithoutgui.txt b/tests/auto/testlib/selftests/expected_waitwithoutgui.txt
index a1691071a01..a1691071a01 100644
--- a/tests/auto/selftests/expected_waitwithoutgui.txt
+++ b/tests/auto/testlib/selftests/expected_waitwithoutgui.txt

diff --git a/tests/auto/selftests/expected_waitwithoutgui.xml b/tests/auto/testlib/selftests/expected_waitwithoutgui.xml
index e69de29bb2d..e69de29bb2d 100644
--- a/tests/auto/selftests/expected_waitwithoutgui.xml
+++ b/tests/auto/testlib/selftests/expected_waitwithoutgui.xml

diff --git a/tests/auto/selftests/expected_waitwithoutgui.xunitxml b/tests/auto/testlib/selftests/expected_waitwithoutgui.xunitxml
index e69de29bb2d..e69de29bb2d 100644
--- a/tests/auto/selftests/expected_waitwithoutgui.xunitxml
+++ b/tests/auto/testlib/selftests/expected_waitwithoutgui.xunitxml

diff --git a/tests/auto/selftests/expected_warnings.lightxml b/tests/auto/testlib/selftests/expected_warnings.lightxml
index 116156ed8ad..116156ed8ad 100644
--- a/tests/auto/selftests/expected_warnings.lightxml
+++ b/tests/auto/testlib/selftests/expected_warnings.lightxml

diff --git a/tests/auto/selftests/expected_warnings.txt b/tests/auto/testlib/selftests/expected_warnings.txt
index 0a9437f47cf..0a9437f47cf 100644
--- a/tests/auto/selftests/expected_warnings.txt
+++ b/tests/auto/testlib/selftests/expected_warnings.txt

diff --git a/tests/auto/selftests/expected_warnings.xml b/tests/auto/testlib/selftests/expected_warnings.xml
index 13e6c1df793..13e6c1df793 100644
--- a/tests/auto/selftests/expected_warnings.xml
+++ b/tests/auto/testlib/selftests/expected_warnings.xml

diff --git a/tests/auto/selftests/expected_warnings.xunitxml b/tests/auto/testlib/selftests/expected_warnings.xunitxml
index a96393d6488..a96393d6488 100644
--- a/tests/auto/selftests/expected_warnings.xunitxml
+++ b/tests/auto/testlib/selftests/expected_warnings.xunitxml

diff --git a/tests/auto/selftests/expected_xunit.lightxml b/tests/auto/testlib/selftests/expected_xunit.lightxml
index 92772015c83..92772015c83 100644
--- a/tests/auto/selftests/expected_xunit.lightxml
+++ b/tests/auto/testlib/selftests/expected_xunit.lightxml

diff --git a/tests/auto/selftests/expected_xunit.txt b/tests/auto/testlib/selftests/expected_xunit.txt
index ac8c0dba232..ac8c0dba232 100644
--- a/tests/auto/selftests/expected_xunit.txt
+++ b/tests/auto/testlib/selftests/expected_xunit.txt

diff --git a/tests/auto/selftests/expected_xunit.xml b/tests/auto/testlib/selftests/expected_xunit.xml
index 8992f499934..8992f499934 100644
--- a/tests/auto/selftests/expected_xunit.xml
+++ b/tests/auto/testlib/selftests/expected_xunit.xml

diff --git a/tests/auto/selftests/expected_xunit.xunitxml b/tests/auto/testlib/selftests/expected_xunit.xunitxml
index e77004f819a..e77004f819a 100644
--- a/tests/auto/selftests/expected_xunit.xunitxml
+++ b/tests/auto/testlib/selftests/expected_xunit.xunitxml

diff --git a/tests/auto/selftests/expectfail/expectfail.pro b/tests/auto/testlib/selftests/expectfail/expectfail.pro
index 1e96018825b..1e96018825b 100644
--- a/tests/auto/selftests/expectfail/expectfail.pro
+++ b/tests/auto/testlib/selftests/expectfail/expectfail.pro

diff --git a/tests/auto/selftests/expectfail/tst_expectfail.cpp b/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp
index 04aef02cc78..04aef02cc78 100644
--- a/tests/auto/selftests/expectfail/tst_expectfail.cpp
+++ b/tests/auto/testlib/selftests/expectfail/tst_expectfail.cpp

diff --git a/tests/auto/selftests/failinit/failinit.pro b/tests/auto/testlib/selftests/failinit/failinit.pro
index 0eedd06427b..0eedd06427b 100644
--- a/tests/auto/selftests/failinit/failinit.pro
+++ b/tests/auto/testlib/selftests/failinit/failinit.pro

diff --git a/tests/auto/selftests/failinit/tst_failinit.cpp b/tests/auto/testlib/selftests/failinit/tst_failinit.cpp
index 0bf448f4283..0bf448f4283 100644
--- a/tests/auto/selftests/failinit/tst_failinit.cpp
+++ b/tests/auto/testlib/selftests/failinit/tst_failinit.cpp

diff --git a/tests/auto/selftests/failinitdata/failinitdata.pro b/tests/auto/testlib/selftests/failinitdata/failinitdata.pro
index 61f393771b7..61f393771b7 100644
--- a/tests/auto/selftests/failinitdata/failinitdata.pro
+++ b/tests/auto/testlib/selftests/failinitdata/failinitdata.pro

diff --git a/tests/auto/selftests/failinitdata/tst_failinitdata.cpp b/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp
index 00e4d122566..00e4d122566 100644
--- a/tests/auto/selftests/failinitdata/tst_failinitdata.cpp
+++ b/tests/auto/testlib/selftests/failinitdata/tst_failinitdata.cpp

diff --git a/tests/auto/selftests/fetchbogus/fetchbogus.pro b/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro
index 9a5e095d0ce..9a5e095d0ce 100644
--- a/tests/auto/selftests/fetchbogus/fetchbogus.pro
+++ b/tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro

diff --git a/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp b/tests/auto/testlib/selftests/fetchbogus/tst_fetchbogus.cpp
index 65d10c180cb..65d10c180cb 100644
--- a/tests/auto/selftests/fetchbogus/tst_fetchbogus.cpp
+++ b/tests/auto/testlib/selftests/fetchbogus/tst_fetchbogus.cpp

diff --git a/tests/auto/selftests/globaldata/globaldata.pro b/tests/auto/testlib/selftests/globaldata/globaldata.pro
index 71a243f6804..71a243f6804 100644
--- a/tests/auto/selftests/globaldata/globaldata.pro
+++ b/tests/auto/testlib/selftests/globaldata/globaldata.pro

diff --git a/tests/auto/selftests/globaldata/tst_globaldata.cpp b/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
index 296f4d674ad..296f4d674ad 100644
--- a/tests/auto/selftests/globaldata/tst_globaldata.cpp
+++ b/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp

diff --git a/tests/auto/selftests/longstring/longstring.pro b/tests/auto/testlib/selftests/longstring/longstring.pro
index d496691e603..d496691e603 100644
--- a/tests/auto/selftests/longstring/longstring.pro
+++ b/tests/auto/testlib/selftests/longstring/longstring.pro

diff --git a/tests/auto/selftests/longstring/tst_longstring.cpp b/tests/auto/testlib/selftests/longstring/tst_longstring.cpp
index 99dac95ba1c..99dac95ba1c 100644
--- a/tests/auto/selftests/longstring/tst_longstring.cpp
+++ b/tests/auto/testlib/selftests/longstring/tst_longstring.cpp

diff --git a/tests/auto/selftests/maxwarnings/maxwarnings.cpp b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.cpp
index 398d0d8e4a3..398d0d8e4a3 100644
--- a/tests/auto/selftests/maxwarnings/maxwarnings.cpp
+++ b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.cpp

diff --git a/tests/auto/selftests/maxwarnings/maxwarnings.pro b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro
index 42a122d02a5..42a122d02a5 100644
--- a/tests/auto/selftests/maxwarnings/maxwarnings.pro
+++ b/tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro

diff --git a/tests/auto/selftests/multiexec/multiexec.pro b/tests/auto/testlib/selftests/multiexec/multiexec.pro
index 5a3f5affaf7..5a3f5affaf7 100644
--- a/tests/auto/selftests/multiexec/multiexec.pro
+++ b/tests/auto/testlib/selftests/multiexec/multiexec.pro

diff --git a/tests/auto/selftests/multiexec/tst_multiexec.cpp b/tests/auto/testlib/selftests/multiexec/tst_multiexec.cpp
index 0480714c77d..0480714c77d 100644
--- a/tests/auto/selftests/multiexec/tst_multiexec.cpp
+++ b/tests/auto/testlib/selftests/multiexec/tst_multiexec.cpp

diff --git a/tests/auto/selftests/qexecstringlist/qexecstringlist.pro b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro
index d994ceabf35..d994ceabf35 100644
--- a/tests/auto/selftests/qexecstringlist/qexecstringlist.pro
+++ b/tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro

diff --git a/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp b/tests/auto/testlib/selftests/qexecstringlist/tst_qexecstringlist.cpp
index aacfab76f10..aacfab76f10 100644
--- a/tests/auto/selftests/qexecstringlist/tst_qexecstringlist.cpp
+++ b/tests/auto/testlib/selftests/qexecstringlist/tst_qexecstringlist.cpp

diff --git a/tests/auto/selftests/selftests.pro b/tests/auto/testlib/selftests/selftests.pro
index 2f1c327e341..2f1c327e341 100644
--- a/tests/auto/selftests/selftests.pro
+++ b/tests/auto/testlib/selftests/selftests.pro

diff --git a/tests/auto/selftests/selftests.qrc b/tests/auto/testlib/selftests/selftests.qrc
index f82722b0e2b..f82722b0e2b 100644
--- a/tests/auto/selftests/selftests.qrc
+++ b/tests/auto/testlib/selftests/selftests.qrc

diff --git a/tests/auto/selftests/singleskip/singleskip.pro b/tests/auto/testlib/selftests/singleskip/singleskip.pro
index 34a0f725680..34a0f725680 100644
--- a/tests/auto/selftests/singleskip/singleskip.pro
+++ b/tests/auto/testlib/selftests/singleskip/singleskip.pro

diff --git a/tests/auto/selftests/singleskip/tst_singleskip.cpp b/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp
index 5567b88022c..5567b88022c 100644
--- a/tests/auto/selftests/singleskip/tst_singleskip.cpp
+++ b/tests/auto/testlib/selftests/singleskip/tst_singleskip.cpp

diff --git a/tests/auto/selftests/skip/skip.pro b/tests/auto/testlib/selftests/skip/skip.pro
index 4f4b486ed45..4f4b486ed45 100644
--- a/tests/auto/selftests/skip/skip.pro
+++ b/tests/auto/testlib/selftests/skip/skip.pro

diff --git a/tests/auto/selftests/skip/tst_skip.cpp b/tests/auto/testlib/selftests/skip/tst_skip.cpp
index b5b53884b73..b5b53884b73 100644
--- a/tests/auto/selftests/skip/tst_skip.cpp
+++ b/tests/auto/testlib/selftests/skip/tst_skip.cpp

diff --git a/tests/auto/selftests/skipglobal/skipglobal.pro b/tests/auto/testlib/selftests/skipglobal/skipglobal.pro
index fb8d40cbd98..fb8d40cbd98 100644
--- a/tests/auto/selftests/skipglobal/skipglobal.pro
+++ b/tests/auto/testlib/selftests/skipglobal/skipglobal.pro

diff --git a/tests/auto/selftests/skipglobal/tst_skipglobal.cpp b/tests/auto/testlib/selftests/skipglobal/tst_skipglobal.cpp
index aec32ed0c06..aec32ed0c06 100644
--- a/tests/auto/selftests/skipglobal/tst_skipglobal.cpp
+++ b/tests/auto/testlib/selftests/skipglobal/tst_skipglobal.cpp

diff --git a/tests/auto/selftests/skipinit/skipinit.pro b/tests/auto/testlib/selftests/skipinit/skipinit.pro
index 3d458f3669c..3d458f3669c 100644
--- a/tests/auto/selftests/skipinit/skipinit.pro
+++ b/tests/auto/testlib/selftests/skipinit/skipinit.pro

diff --git a/tests/auto/selftests/skipinit/tst_skipinit.cpp b/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp
index 4cd882f7477..4cd882f7477 100644
--- a/tests/auto/selftests/skipinit/tst_skipinit.cpp
+++ b/tests/auto/testlib/selftests/skipinit/tst_skipinit.cpp

diff --git a/tests/auto/selftests/skipinitdata/skipinitdata.pro b/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro
index 26119eb70cc..26119eb70cc 100644
--- a/tests/auto/selftests/skipinitdata/skipinitdata.pro
+++ b/tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro

diff --git a/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp b/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp
index fb97fc978d3..fb97fc978d3 100644
--- a/tests/auto/selftests/skipinitdata/tst_skipinitdata.cpp
+++ b/tests/auto/testlib/selftests/skipinitdata/tst_skipinitdata.cpp

diff --git a/tests/auto/selftests/sleep/sleep.pro b/tests/auto/testlib/selftests/sleep/sleep.pro
index d963e73ed26..d963e73ed26 100644
--- a/tests/auto/selftests/sleep/sleep.pro
+++ b/tests/auto/testlib/selftests/sleep/sleep.pro

diff --git a/tests/auto/selftests/sleep/tst_sleep.cpp b/tests/auto/testlib/selftests/sleep/tst_sleep.cpp
index e509954b5d2..e509954b5d2 100644
--- a/tests/auto/selftests/sleep/tst_sleep.cpp
+++ b/tests/auto/testlib/selftests/sleep/tst_sleep.cpp

diff --git a/tests/auto/selftests/strcmp/strcmp.pro b/tests/auto/testlib/selftests/strcmp/strcmp.pro
index 8cf1caa906f..8cf1caa906f 100644
--- a/tests/auto/selftests/strcmp/strcmp.pro
+++ b/tests/auto/testlib/selftests/strcmp/strcmp.pro

diff --git a/tests/auto/selftests/strcmp/tst_strcmp.cpp b/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp
index 89689bb3bcc..89689bb3bcc 100644
--- a/tests/auto/selftests/strcmp/tst_strcmp.cpp
+++ b/tests/auto/testlib/selftests/strcmp/tst_strcmp.cpp

diff --git a/tests/auto/selftests/subtest/subtest.pro b/tests/auto/testlib/selftests/subtest/subtest.pro
index ac237790d2f..ac237790d2f 100644
--- a/tests/auto/selftests/subtest/subtest.pro
+++ b/tests/auto/testlib/selftests/subtest/subtest.pro

diff --git a/tests/auto/selftests/subtest/tst_subtest.cpp b/tests/auto/testlib/selftests/subtest/tst_subtest.cpp
index 4404a5103f0..4404a5103f0 100644
--- a/tests/auto/selftests/subtest/tst_subtest.cpp
+++ b/tests/auto/testlib/selftests/subtest/tst_subtest.cpp

diff --git a/tests/auto/selftests/test/test.pro b/tests/auto/testlib/selftests/test/test.pro
index f0e0f7593c0..f0e0f7593c0 100644
--- a/tests/auto/selftests/test/test.pro
+++ b/tests/auto/testlib/selftests/test/test.pro

diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 138e47927f1..138e47927f1 100644
--- a/tests/auto/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp

diff --git a/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp b/tests/auto/testlib/selftests/waitwithoutgui/tst_waitwithoutgui.cpp
index 9c0bb862b38..9c0bb862b38 100644
--- a/tests/auto/selftests/waitwithoutgui/tst_waitwithoutgui.cpp
+++ b/tests/auto/testlib/selftests/waitwithoutgui/tst_waitwithoutgui.cpp

diff --git a/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro b/tests/auto/testlib/selftests/waitwithoutgui/waitwithoutgui.pro
index 6c28390da9d..6c28390da9d 100644
--- a/tests/auto/selftests/waitwithoutgui/waitwithoutgui.pro
+++ b/tests/auto/testlib/selftests/waitwithoutgui/waitwithoutgui.pro

diff --git a/tests/auto/selftests/warnings/tst_warnings.cpp b/tests/auto/testlib/selftests/warnings/tst_warnings.cpp
index 52a992c763a..52a992c763a 100644
--- a/tests/auto/selftests/warnings/tst_warnings.cpp
+++ b/tests/auto/testlib/selftests/warnings/tst_warnings.cpp

diff --git a/tests/auto/selftests/warnings/warnings.pro b/tests/auto/testlib/selftests/warnings/warnings.pro
index 147d96a02fe..147d96a02fe 100644
--- a/tests/auto/selftests/warnings/warnings.pro
+++ b/tests/auto/testlib/selftests/warnings/warnings.pro

diff --git a/tests/auto/selftests/xunit/tst_xunit.cpp b/tests/auto/testlib/selftests/xunit/tst_xunit.cpp
index 8f2f7124263..8f2f7124263 100644
--- a/tests/auto/selftests/xunit/tst_xunit.cpp
+++ b/tests/auto/testlib/selftests/xunit/tst_xunit.cpp

diff --git a/tests/auto/selftests/xunit/xunit.pro b/tests/auto/testlib/selftests/xunit/xunit.pro
index e523520ed65..e523520ed65 100644
--- a/tests/auto/selftests/xunit/xunit.pro
+++ b/tests/auto/testlib/selftests/xunit/xunit.pro

diff --git a/tests/auto/testlib/testlib.pro b/tests/auto/testlib/testlib.pro
new file mode 100644
index 00000000000..3a66f8cc6c6
--- /dev/null
+++ b/tests/auto/testlib/testlib.pro