From 973e74399e807fb6f351a7d330c8c8b85b66bc5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Thu, 29 Jul 2021 09:59:59 +0200
Subject: [PATCH] testlib: Improve JUnit XML conformance
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The JUnit test framework did not initially have any XML reporting
facilities built in. Instead, the XML report was generated by the
Apache Ant JUnit task:

 https://github.com/apache/ant/search?q=filename%3AXMLJUnitResultFormatter.java

Many users interacted with these reports via the Jenkins JUnit plugin,
which provided graphical visualization of the test results:

 https://plugins.jenkins.io/junit/

Due to the lack of an official XML schema for the Apache Ant JUnit
report there was some confusion about what the actual format was.
People started documenting the de-facto format, both as produced
by Ant, and as consumed by Jenkins:

 https://github.com/windyroad/JUnit-Schema/blob/master/JUnit.xsd
 https://github.com/junit-team/junit5/search?q=filename%3Ajenkins-junit.xsd

The XML produced by the Qt Test JUnit reporter was far from these
schemas, causing issues when importing results into tools such
as Jenkins, Allure2, or Test Center.

The following changes have been made to improve conformance:

  - The 'timestamp' attribute on <testsuite> is is now in ISO
    8601 local time, without any time zone specified
  - The 'hostname' attribute on <testsuite> is now included
  - The 'classname' attribute on <testcase> is now included
  - The non-standard 'result' attribute on <testcase> has
    been removed
  - The non-standard 'result' attribute on <failure> has
    been renamed to 'type'
  - The <system-out> element on <testsuite> is always included,
    even when empty
  - The non-standard 'tag' attribute on <failure> has been
    removed. Data-driven tests are now represented as individual
    <testcase> elements, e.g.:

      <testcase name="someTest(someData X)" ...>
      <testcase name="someTest(someData Y)" ...>
      <testcase name="someTest(someData Z)" ...>

The resulting XML validates against both the de-facto Apache Ant
'JUnit 4' schema and the Jenkins JUnit plugin schema.

Task-number: QTBUG-95424
Change-Id: I6fc9abedbfb319f2545b99b37d059b18c16776ff
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/testlib/qjunittestlogger.cpp              | 116 ++++---
 src/testlib/qjunittestlogger_p.h              |   7 +-
 src/testlib/qtestelementattribute.cpp         |   4 +-
 src/testlib/qtestelementattribute_p.h         |   4 +-
 .../selftests/expected_assert.junitxml        |  11 +-
 .../selftests/expected_badxml.junitxml        |  68 ++--
 .../expected_benchlibcallgrind.junitxml       |   8 +-
 .../expected_benchlibcounting.junitxml        |  14 +-
 .../expected_benchlibeventcounter.junitxml    |  15 +-
 .../expected_benchliboptions.junitxml         |  27 +-
 .../expected_benchlibtickcounter.junitxml     |   9 +-
 .../expected_benchlibwalltime.junitxml        |  13 +-
 .../selftests/expected_blacklisted.junitxml   |  16 +-
 .../selftests/expected_cmptest.junitxml       | 292 +++++++++++-------
 .../expected_commandlinedata.junitxml         |  31 +-
 .../selftests/expected_counting.junitxml      |  89 ++++--
 .../selftests/expected_datatable.junitxml     |  81 +++--
 .../selftests/expected_datetime.junitxml      |  27 +-
 .../expected_exceptionthrow.junitxml          |   9 +-
 .../selftests/expected_expectfail.junitxml    |  68 ++--
 .../selftests/expected_failcleanup.junitxml   |  11 +-
 .../selftests/expected_faildatatype.junitxml  |   8 +-
 .../selftests/expected_failfetchtype.junitxml |  11 +-
 .../selftests/expected_failinit.junitxml      |   9 +-
 .../selftests/expected_failinitdata.junitxml  |   7 +-
 .../selftests/expected_fetchbogus.junitxml    |  11 +-
 .../selftests/expected_findtestdata.junitxml  |   9 +-
 .../selftests/expected_globaldata.junitxml    | 114 ++++---
 .../testlib/selftests/expected_junit.junitxml |  26 +-
 .../selftests/expected_keyboard.junitxml      |   9 +-
 .../selftests/expected_longstring.junitxml    |  11 +-
 .../selftests/expected_maxwarnings.junitxml   |   8 +-
 .../selftests/expected_multiexec.junitxml     |  45 +--
 .../expected_pairdiagnostics.junitxml         |  15 +-
 .../testlib/selftests/expected_pass.junitxml  |  13 +-
 .../expected_qexecstringlist.junitxml         |  15 +-
 .../selftests/expected_signaldumper.junitxml  | 262 ++++++++--------
 .../selftests/expected_silent.junitxml        |  22 +-
 .../selftests/expected_singleskip.junitxml    |   8 +-
 .../testlib/selftests/expected_skip.junitxml  |  18 +-
 .../selftests/expected_skipcleanup.junitxml   |   8 +-
 .../selftests/expected_skipinit.junitxml      |   6 +-
 .../selftests/expected_skipinitdata.junitxml  |   4 +-
 .../testlib/selftests/expected_sleep.junitxml |  11 +-
 .../selftests/expected_strcmp.junitxml        |  28 +-
 .../selftests/expected_subtest.junitxml       |  76 +++--
 .../selftests/expected_testlib.junitxml       |  20 +-
 .../expected_tuplediagnostics.junitxml        |  17 +-
 .../selftests/expected_verbose1.junitxml      |  89 ++++--
 .../selftests/expected_verbose2.junitxml      | 130 ++++----
 .../expected_verifyexceptionthrown.junitxml   |  37 +--
 .../selftests/expected_warnings.junitxml      |  32 +-
 .../selftests/expected_watchdog.junitxml      |   9 +-
 .../selftests/generate_expected_output.py     |   1 +
 .../auto/testlib/selftests/tst_selftests.cpp  |   2 +
 55 files changed, 1154 insertions(+), 857 deletions(-)

diff --git a/src/testlib/qjunittestlogger.cpp b/src/testlib/qjunittestlogger.cpp
index 6374eb0f9d..a34b431060 100644
--- a/src/testlib/qjunittestlogger.cpp
+++ b/src/testlib/qjunittestlogger.cpp
@@ -69,6 +69,14 @@ QJUnitTestLogger::~QJUnitTestLogger()
     delete logFormatter;
 }
 
+// We track test timing per test case, so we
+// need to maintain our own elapsed timer.
+static QElapsedTimer elapsedTestcaseTime;
+static qreal elapsedTestCaseSeconds()
+{
+    return elapsedTestcaseTime.nsecsElapsed() / 1e9;
+}
+
 void QJUnitTestLogger::startLogging()
 {
     QAbstractTestLogger::startLogging();
@@ -84,9 +92,11 @@ void QJUnitTestLogger::startLogging()
     currentTestSuite->addAttribute(QTest::AI_Name, QTestResult::currentTestObjectName());
 
     auto localTime = QDateTime::currentDateTime();
-    auto localTimeWithUtcOffset = localTime.toOffsetFromUtc(localTime.offsetFromUtc());
     currentTestSuite->addAttribute(QTest::AI_Timestamp,
-        localTimeWithUtcOffset.toString(Qt::ISODate).toUtf8().constData());
+        localTime.toString(Qt::ISODate).toUtf8().constData());
+
+    currentTestSuite->addAttribute(QTest::AI_Hostname,
+        QSysInfo::machineHostName().toUtf8().constData());
 
     QTestElement *property;
     QTestElement *properties = new QTestElement(QTest::LET_Properties);
@@ -107,6 +117,8 @@ void QJUnitTestLogger::startLogging()
     properties->addLogElement(property);
 
     currentTestSuite->addLogElement(properties);
+
+    elapsedTestcaseTime.start();
 }
 
 void QJUnitTestLogger::stopLogging()
@@ -134,8 +146,7 @@ void QJUnitTestLogger::stopLogging()
         testcase = testcase->nextElement();
     }
 
-    if (systemOutputElement->childElements())
-        currentTestSuite->addLogElement(systemOutputElement);
+    currentTestSuite->addLogElement(systemOutputElement);
     currentTestSuite->addLogElement(systemErrorElement);
 
     logFormatter->output(currentTestSuite);
@@ -147,20 +158,54 @@ void QJUnitTestLogger::stopLogging()
 }
 
 void QJUnitTestLogger::enterTestFunction(const char *function)
+{
+    enterTestCase(function);
+}
+
+void QJUnitTestLogger::enterTestCase(const char *name)
 {
     currentLogElement = new QTestElement(QTest::LET_TestCase);
-    currentLogElement->addAttribute(QTest::AI_Name, function);
+    currentLogElement->addAttribute(QTest::AI_Name, name);
+    currentLogElement->addAttribute(QTest::AI_Classname, QTestResult::currentTestObjectName());
     currentLogElement->addToList(&listOfTestcases);
 
     // The element will be deleted when the suite is deleted
 
     ++testCounter;
+
+    elapsedTestcaseTime.restart();
+}
+
+void QJUnitTestLogger::enterTestData(QTestData *)
+{
+    QTestCharBuffer testIdentifier;
+    QTestPrivate::generateTestIdentifier(&testIdentifier,
+        QTestPrivate::TestFunction | QTestPrivate::TestDataTag);
+
+    static const char *lastTestFunction = nullptr;
+    if (QTestResult::currentTestFunction() != lastTestFunction) {
+        // Adopt existing testcase for the initial test data
+        auto *name = const_cast<QTestElementAttribute*>(
+            currentLogElement->attribute(QTest::AI_Name));
+        name->setPair(QTest::AI_Name, testIdentifier.data());
+        lastTestFunction = QTestResult::currentTestFunction();
+        elapsedTestcaseTime.restart();
+    } else {
+        // Create new test cases for remaining test data
+        leaveTestCase();
+        enterTestCase(testIdentifier.data());
+    }
 }
 
 void QJUnitTestLogger::leaveTestFunction()
+{
+    leaveTestCase();
+}
+
+void QJUnitTestLogger::leaveTestCase()
 {
     currentLogElement->addAttribute(QTest::AI_Time,
-        QByteArray::number(QTestLog::msecsFunctionTime() / 1000, 'f').constData());
+        QByteArray::number(elapsedTestCaseSeconds(), 'f').constData());
 }
 
 void QJUnitTestLogger::addIncident(IncidentTypes type, const char *description,
@@ -204,46 +249,11 @@ void QJUnitTestLogger::addIncident(IncidentTypes type, const char *description,
 
     if (type == QAbstractTestLogger::Fail || type == QAbstractTestLogger::XPass) {
         QTestElement *failureElement = new QTestElement(QTest::LET_Failure);
-        failureElement->addAttribute(QTest::AI_Result, typeBuf);
+        failureElement->addAttribute(QTest::AI_Type, typeBuf);
         failureElement->addAttribute(QTest::AI_Message, description);
-        addTag(failureElement);
         currentLogElement->addLogElement(failureElement);
     }
 
-    /*
-        Only one result can be shown for the whole testfunction.
-        Check if we currently have a result, and if so, overwrite it
-        iff the new result is worse.
-    */
-    QTestElementAttribute* resultAttr =
-        const_cast<QTestElementAttribute*>(currentLogElement->attribute(QTest::AI_Result));
-    if (resultAttr) {
-        const char* oldResult = resultAttr->value();
-        bool overwrite = false;
-        if (!strcmp(oldResult, "pass")) {
-            overwrite = true;
-        }
-        else if (!strcmp(oldResult, "bpass") || !strcmp(oldResult, "bxfail")) {
-            overwrite = (type == QAbstractTestLogger::XPass || type == QAbstractTestLogger::Fail) || (type == QAbstractTestLogger::XFail)
-                    || (type == QAbstractTestLogger::BlacklistedFail) || (type == QAbstractTestLogger::BlacklistedXPass);
-        }
-        else if (!strcmp(oldResult, "bfail") || !strcmp(oldResult, "bxpass")) {
-            overwrite = (type == QAbstractTestLogger::XPass || type == QAbstractTestLogger::Fail) || (type == QAbstractTestLogger::XFail);
-        }
-        else if (!strcmp(oldResult, "xfail")) {
-            overwrite = (type == QAbstractTestLogger::XPass || type == QAbstractTestLogger::Fail);
-        }
-        else if (!strcmp(oldResult, "xpass")) {
-            overwrite = (type == QAbstractTestLogger::Fail);
-        }
-        if (overwrite) {
-            resultAttr->setPair(QTest::AI_Result, typeBuf);
-        }
-    }
-    else {
-        currentLogElement->addAttribute(QTest::AI_Result, typeBuf);
-    }
-
     /*
         Since XFAIL does not add a failure to the testlog in junitxml, add a message, so we still
         have some information about the expected failure.
@@ -253,27 +263,6 @@ void QJUnitTestLogger::addIncident(IncidentTypes type, const char *description,
     }
 }
 
-void QJUnitTestLogger::addTag(QTestElement* element)
-{
-    const char *tag = QTestResult::currentDataTag();
-    const char *gtag = QTestResult::currentGlobalDataTag();
-    const char *filler = (tag && gtag) ? ":" : "";
-    if ((!tag || !tag[0]) && (!gtag || !gtag[0])) {
-        return;
-    }
-
-    if (!tag) {
-        tag = "";
-    }
-    if (!gtag) {
-        gtag = "";
-    }
-
-    QTestCharBuffer buf;
-    QTest::qt_asprintf(&buf, "%s%s%s", gtag, filler, tag);
-    element->addAttribute(QTest::AI_Tag, buf.constData());
-}
-
 void QJUnitTestLogger::addMessage(MessageTypes type, const QString &message, const char *file, int line)
 {
     Q_UNUSED(file);
@@ -318,7 +307,6 @@ void QJUnitTestLogger::addMessage(MessageTypes type, const QString &message, con
 
     messageElement->addAttribute(QTest::AI_Type, typeBuf);
     messageElement->addAttribute(QTest::AI_Message, message.toUtf8().constData());
-    addTag(messageElement);
 
     currentLogElement->addLogElement(messageElement);
     ++errorCounter;
diff --git a/src/testlib/qjunittestlogger_p.h b/src/testlib/qjunittestlogger_p.h
index 30de0b2eb0..4c5f05e885 100644
--- a/src/testlib/qjunittestlogger_p.h
+++ b/src/testlib/qjunittestlogger_p.h
@@ -70,16 +70,19 @@ class QJUnitTestLogger : public QAbstractTestLogger
         void enterTestFunction(const char *function) override;
         void leaveTestFunction() override;
 
+        void enterTestData(QTestData *) override;
+
         void addIncident(IncidentTypes type, const char *description,
                      const char *file = nullptr, int line = 0) override;
-        void addTag(QTestElement* element);
-
         void addMessage(MessageTypes type, const QString &message,
                     const char *file = nullptr, int line = 0) override;
 
         void addBenchmarkResult(const QBenchmarkResult &) override {}
 
     private:
+        void enterTestCase(const char *name);
+        void leaveTestCase();
+
         QTestElement *currentTestSuite = nullptr;
         QTestElement *listOfTestcases = nullptr;
         QTestElement *currentLogElement = nullptr;
diff --git a/src/testlib/qtestelementattribute.cpp b/src/testlib/qtestelementattribute.cpp
index 265f126e5a..d091804f8c 100644
--- a/src/testlib/qtestelementattribute.cpp
+++ b/src/testlib/qtestelementattribute.cpp
@@ -143,7 +143,9 @@ const char *QTestElementAttribute::name() const
         "value",
         "iterations",
         "time",
-        "timestamp"
+        "timestamp",
+        "hostname",
+        "classname"
     };
 
     if (attributeIndex != QTest::AI_Undefined)
diff --git a/src/testlib/qtestelementattribute_p.h b/src/testlib/qtestelementattribute_p.h
index a09e19dccb..973d43ace8 100644
--- a/src/testlib/qtestelementattribute_p.h
+++ b/src/testlib/qtestelementattribute_p.h
@@ -78,7 +78,9 @@ namespace QTest {
         AI_Value = 14,
         AI_Iterations = 15,
         AI_Time = 16,
-        AI_Timestamp = 17
+        AI_Timestamp = 17,
+        AI_Hostname = 18,
+        AI_Classname = 19,
     };
 
     enum LogElementType
diff --git a/tests/auto/testlib/selftests/expected_assert.junitxml b/tests/auto/testlib/selftests/expected_assert.junitxml
index 4905ec73c5..dbe35c0f7f 100644
--- a/tests/auto/testlib/selftests/expected_assert.junitxml
+++ b/tests/auto/testlib/selftests/expected_assert.junitxml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Assert" timestamp="@TEST_START_TIME@" tests="3" failures="1" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_Assert" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testNumber1" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testNumber2" result="fail" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_Assert" time="@TEST_DURATION@"/>
+  <testcase name="testNumber1" classname="tst_Assert" time="@TEST_DURATION@"/>
+  <testcase name="testNumber2" classname="tst_Assert" time="@TEST_DURATION@">
     <!-- type="qfatal" message="ASSERT: &quot;false&quot; in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0" -->
-    <failure result="fail" message="Received a fatal error."/>
+    <failure type="fail" message="Received a fatal error."/>
   </testcase>
+  <system-out/>
   <system-err>
 <![CDATA[ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0]]>
   </system-err>
diff --git a/tests/auto/testlib/selftests/expected_badxml.junitxml b/tests/auto/testlib/selftests/expected_badxml.junitxml
index 75a08ead6c..31317ecc17 100644
--- a/tests/auto/testlib/selftests/expected_badxml.junitxml
+++ b/tests/auto/testlib/selftests/expected_badxml.junitxml
@@ -1,38 +1,58 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BadXml" timestamp="@TEST_START_TIME@" tests="6" failures="5" errors="13" time="@TEST_DURATION@">
+<testsuite name="tst_BadXml" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="16" failures="5" errors="13" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="badDataTag" result="fail" time="@TEST_DURATION@">
-    <!-- type="qdebug" message="a message" tag="fail end cdata ]]&gt; text ]]&gt; more text" -->
-    <failure result="fail" message="a failure" tag="fail end cdata ]]&gt; text ]]&gt; more text"/>
-    <!-- type="qdebug" message="a message" tag="pass end cdata ]]&gt; text ]]&gt; more text" -->
-    <!-- type="qdebug" message="a message" tag="fail quotes &quot; text&quot; more text" -->
-    <failure result="fail" message="a failure" tag="fail quotes &quot; text&quot; more text"/>
-    <!-- type="qdebug" message="a message" tag="pass quotes &quot; text&quot; more text" -->
-    <!-- type="qdebug" message="a message" tag="fail xml close &gt; open &lt; tags &lt; text" -->
-    <failure result="fail" message="a failure" tag="fail xml close &gt; open &lt; tags &lt; text"/>
-    <!-- type="qdebug" message="a message" tag="pass xml close &gt; open &lt; tags &lt; text" -->
-    <!-- type="qdebug" message="a message" tag="fail all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" -->
-    <failure result="fail" message="a failure" tag="fail all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs"/>
-    <!-- type="qdebug" message="a message" tag="pass all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" -->
+  <testcase name="initTestCase" classname="tst_BadXml" time="@TEST_DURATION@"/>
+  <testcase name="badDataTag(fail end cdata ]]&gt; text ]]&gt; more text)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="a message" -->
+    <failure type="fail" message="a failure"/>
   </testcase>
-  <testcase name="badMessage" result="pass" time="@TEST_DURATION@">
-    <!-- type="qdebug" message="end cdata ]]&gt; text ]]&gt; more text" tag="string 0" -->
-    <!-- type="qdebug" message="quotes &quot; text&quot; more text" tag="string 1" -->
-    <!-- type="qdebug" message="xml close &gt; open &lt; tags &lt; text" tag="string 2" -->
-    <!-- type="qdebug" message="all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" tag="string 3" -->
+  <testcase name="badDataTag(pass end cdata ]]&gt; text ]]&gt; more text)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="a message" -->
   </testcase>
-  <testcase name="failWithNoFile" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="failure message"/>
+  <testcase name="badDataTag(fail quotes &quot; text&quot; more text)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="a message" -->
+    <failure type="fail" message="a failure"/>
   </testcase>
-  <testcase name="encoding" result="pass" time="@TEST_DURATION@">
+  <testcase name="badDataTag(pass quotes &quot; text&quot; more text)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="a message" -->
+  </testcase>
+  <testcase name="badDataTag(fail xml close &gt; open &lt; tags &lt; text)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="a message" -->
+    <failure type="fail" message="a failure"/>
+  </testcase>
+  <testcase name="badDataTag(pass xml close &gt; open &lt; tags &lt; text)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="a message" -->
+  </testcase>
+  <testcase name="badDataTag(fail all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="a message" -->
+    <failure type="fail" message="a failure"/>
+  </testcase>
+  <testcase name="badDataTag(pass all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="a message" -->
+  </testcase>
+  <testcase name="badMessage(string 0)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="end cdata ]]&gt; text ]]&gt; more text" -->
+  </testcase>
+  <testcase name="badMessage(string 1)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="quotes &quot; text&quot; more text" -->
+  </testcase>
+  <testcase name="badMessage(string 2)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="xml close &gt; open &lt; tags &lt; text" -->
+  </testcase>
+  <testcase name="badMessage(string 3)" classname="tst_BadXml" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="all &gt; &quot; mixed ]]&gt; up &gt; &quot; in &lt; the ]]&gt; hopes &lt; of triggering &quot;&lt; ]]&gt; bugs" -->
+  </testcase>
+  <testcase name="failWithNoFile" classname="tst_BadXml" time="@TEST_DURATION@">
+    <failure type="fail" message="failure message"/>
+  </testcase>
+  <testcase name="encoding" classname="tst_BadXml" time="@TEST_DURATION@">
     <!-- type="qdebug" message="&quot;Ülrich Ümläut&quot;" -->
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_BadXml" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[a message]]>
 <![CDATA[a message]]>
diff --git a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
index a2e67447d5..ed546cbb94 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcallgrind.junitxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibCallgrind" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_BenchlibCallgrind" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="twoHundredMillionInstructions" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_BenchlibCallgrind" time="@TEST_DURATION@"/>
+  <testcase name="twoHundredMillionInstructions" classname="tst_BenchlibCallgrind" time="@TEST_DURATION@">
     <!-- type="skip" message="This test is only defined for gcc and x86." -->
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_BenchlibCallgrind" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[This test is only defined for gcc and x86.]]>
   </system-out>
diff --git a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml
index 166a924c9b..c5e4641903 100644
--- a/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibcounting.junitxml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibCounting" timestamp="@TEST_START_TIME@" tests="5" failures="1" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_BenchlibCounting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="1" errors="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="passingBenchmark" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="skippingBenchmark" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_BenchlibCounting" time="@TEST_DURATION@"/>
+  <testcase name="passingBenchmark" classname="tst_BenchlibCounting" time="@TEST_DURATION@"/>
+  <testcase name="skippingBenchmark" classname="tst_BenchlibCounting" time="@TEST_DURATION@">
     <!-- type="skip" message="This is a skipping benchmark" -->
   </testcase>
-  <testcase name="failingBenchmark" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="This is a failing benchmark"/>
+  <testcase name="failingBenchmark" classname="tst_BenchlibCounting" time="@TEST_DURATION@">
+    <failure type="fail" message="This is a failing benchmark"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_BenchlibCounting" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[This is a skipping benchmark]]>
   </system-out>
diff --git a/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml
index 68d2ec129e..059299b017 100644
--- a/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibeventcounter.junitxml
@@ -1,12 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibEventCounter" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_BenchlibEventCounter" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="events" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_BenchlibEventCounter" time="@TEST_DURATION@"/>
+  <testcase name="events(0)" classname="tst_BenchlibEventCounter" time="@TEST_DURATION@"/>
+  <testcase name="events(1)" classname="tst_BenchlibEventCounter" time="@TEST_DURATION@"/>
+  <testcase name="events(10)" classname="tst_BenchlibEventCounter" time="@TEST_DURATION@"/>
+  <testcase name="events(100)" classname="tst_BenchlibEventCounter" time="@TEST_DURATION@"/>
+  <testcase name="events(500)" classname="tst_BenchlibEventCounter" time="@TEST_DURATION@"/>
+  <testcase name="events(5000)" classname="tst_BenchlibEventCounter" time="@TEST_DURATION@"/>
+  <testcase name="events(100000)" classname="tst_BenchlibEventCounter" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_BenchlibEventCounter" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml
index 1744c63973..b2546057da 100644
--- a/tests/auto/testlib/selftests/expected_benchliboptions.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchliboptions.junitxml
@@ -1,36 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibOptions" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_BenchlibOptions" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="threeEvents" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_BenchlibOptions" time="@TEST_DURATION@"/>
+  <testcase name="threeEvents" classname="tst_BenchlibOptions" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_BenchlibOptions" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibFifteenIterations" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_BenchlibFifteenIterations" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="threeEvents" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_BenchlibFifteenIterations" time="@TEST_DURATION@"/>
+  <testcase name="threeEvents" classname="tst_BenchlibFifteenIterations" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_BenchlibFifteenIterations" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibOneHundredMinimum" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_BenchlibOneHundredMinimum" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="threeEvents" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_BenchlibOneHundredMinimum" time="@TEST_DURATION@"/>
+  <testcase name="threeEvents" classname="tst_BenchlibOneHundredMinimum" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_BenchlibOneHundredMinimum" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml
index 59240506bd..7ad245c7ee 100644
--- a/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibtickcounter.junitxml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibTickCounter" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_BenchlibTickCounter" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="threeBillionTicks" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_BenchlibTickCounter" time="@TEST_DURATION@"/>
+  <testcase name="threeBillionTicks" classname="tst_BenchlibTickCounter" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_BenchlibTickCounter" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml
index 0267b52ce6..1c525faf8d 100644
--- a/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml
+++ b/tests/auto/testlib/selftests/expected_benchlibwalltime.junitxml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_BenchlibWalltime" timestamp="@TEST_START_TIME@" tests="5" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_BenchlibWalltime" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="waitForOneThousand" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="waitForFourThousand" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="qbenchmark_once" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_BenchlibWalltime" time="@TEST_DURATION@"/>
+  <testcase name="waitForOneThousand" classname="tst_BenchlibWalltime" time="@TEST_DURATION@"/>
+  <testcase name="waitForFourThousand" classname="tst_BenchlibWalltime" time="@TEST_DURATION@"/>
+  <testcase name="qbenchmark_once" classname="tst_BenchlibWalltime" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_BenchlibWalltime" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.junitxml b/tests/auto/testlib/selftests/expected_blacklisted.junitxml
index 9d6131403e..34b3e37966 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.junitxml
+++ b/tests/auto/testlib/selftests/expected_blacklisted.junitxml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Blacklisted" timestamp="@TEST_START_TIME@" tests="7" failures="3" errors="8" time="@TEST_DURATION@">
+<testsuite name="tst_Blacklisted" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="8" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="pass" result="bpass" time="@TEST_DURATION@"/>
-  <testcase name="skip" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_Blacklisted" time="@TEST_DURATION@"/>
+  <testcase name="pass" classname="tst_Blacklisted" time="@TEST_DURATION@"/>
+  <testcase name="skip" classname="tst_Blacklisted" time="@TEST_DURATION@">
     <!-- type="skip" message="This test should SKIP" -->
   </testcase>
-  <testcase name="fail" result="bfail" time="@TEST_DURATION@"/>
-  <testcase name="xfail" result="bxfail" time="@TEST_DURATION@"/>
-  <testcase name="xpass" result="bxpass" time="@TEST_DURATION@"/>
-  <testcase name="messages" result="bfail" time="@TEST_DURATION@">
+  <testcase name="fail" classname="tst_Blacklisted" time="@TEST_DURATION@"/>
+  <testcase name="xfail" classname="tst_Blacklisted" time="@TEST_DURATION@"/>
+  <testcase name="xpass" classname="tst_Blacklisted" time="@TEST_DURATION@"/>
+  <testcase name="messages" classname="tst_Blacklisted" time="@TEST_DURATION@">
     <!-- type="qwarn" message="This is a warning that should not appear in silent test output" -->
     <!-- type="warn" message="This is an internal testlib warning that should not appear in silent test output" -->
     <!-- type="qdebug" message="This is a debug message that should not appear in silent test output" -->
diff --git a/tests/auto/testlib/selftests/expected_cmptest.junitxml b/tests/auto/testlib/selftests/expected_cmptest.junitxml
index 1ce3271dcd..be8a0f36fe 100644
--- a/tests/auto/testlib/selftests/expected_cmptest.junitxml
+++ b/tests/auto/testlib/selftests/expected_cmptest.junitxml
@@ -1,187 +1,249 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Cmptest" timestamp="@TEST_START_TIME@" tests="29" failures="46" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_Cmptest" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="67" failures="46" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="compare_unregistered_enums" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="initTestCase" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compare_unregistered_enums" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (MyUnregisteredEnumValue1): 0
    Expected (MyUnregisteredEnumValue2): 1"/>
   </testcase>
-  <testcase name="compare_registered_enums" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="compare_registered_enums" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (Qt::Monday): Monday
    Expected (Qt::Sunday): Sunday"/>
   </testcase>
-  <testcase name="compare_class_enums" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="compare_class_enums" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (MyClassEnum::MyClassEnumValue1): MyClassEnumValue1
    Expected (MyClassEnum::MyClassEnumValue2): MyClassEnumValue2"/>
   </testcase>
-  <testcase name="test_windowflags" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="test_windowflags(pass)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="test_windowflags(fail1)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (actualWindowFlags)  : Window|WindowSystemMenuHint|WindowStaysOnBottomHint
-   Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint" tag="fail1"/>
-    <failure result="fail" message="Compared values are not the same
+   Expected (expectedWindowFlags): Window|FramelessWindowHint|WindowSystemMenuHint|WindowStaysOnBottomHint"/>
+  </testcase>
+  <testcase name="test_windowflags(fail2)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (actualWindowFlags)  : Window
-   Expected (expectedWindowFlags): Window|FramelessWindowHint" tag="fail2"/>
+   Expected (expectedWindowFlags): Window|FramelessWindowHint"/>
   </testcase>
-  <testcase name="test_unregistered_flags" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="test_unregistered_flags(pass)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="test_unregistered_flags(fail1)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (actualFlags)  : 0x3
-   Expected (expectedFlags): 0x5" tag="fail1"/>
-    <failure result="fail" message="Compared values are not the same
+   Expected (expectedFlags): 0x5"/>
+  </testcase>
+  <testcase name="test_unregistered_flags(fail2)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (actualFlags)  : 0x1
-   Expected (expectedFlags): 0x5" tag="fail2"/>
+   Expected (expectedFlags): 0x5"/>
   </testcase>
-  <testcase name="compare_boolfuncs" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="compare_to_nullptr" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="compare_pointerfuncs" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="compare_tostring" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="compare_boolfuncs" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compare_to_nullptr" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compare_pointerfuncs" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compare_tostring(int, string)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (actual)  : QVariant(int,123)
-   Expected (expected): QVariant(QString,hi)" tag="int, string"/>
-    <failure result="fail" message="Compared values are not the same
-   Actual   (actual)  : QVariant(QVariantHash)
-   Expected (expected): QVariant()" tag="null hash, invalid"/>
-    <failure result="fail" message="Compared values are not the same
-   Actual   (actual)  : QVariant(QString,A simple string)
-   Expected (expected): QVariant(PhonyClass)" tag="string, null user type"/>
-    <failure result="fail" message="Compared values are not the same
-   Actual   (actual)  : QVariant(PhonyClass,&lt;value not representable as string&gt;)
-   Expected (expected): QVariant(PhonyClass,&lt;value not representable as string&gt;)" tag="both non&#x002D;null user type"/>
+   Expected (expected): QVariant(QString,hi)"/>
   </testcase>
-  <testcase name="compareQObjects" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared QObject pointers are not the same
+  <testcase name="compare_tostring(both invalid)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compare_tostring(null hash, invalid)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
+   Actual   (actual)  : QVariant(QVariantHash)
+   Expected (expected): QVariant()"/>
+  </testcase>
+  <testcase name="compare_tostring(string, null user type)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
+   Actual   (actual)  : QVariant(QString,A simple string)
+   Expected (expected): QVariant(PhonyClass)"/>
+  </testcase>
+  <testcase name="compare_tostring(both non&#x002D;null user type)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
+   Actual   (actual)  : QVariant(PhonyClass,&lt;value not representable as string&gt;)
+   Expected (expected): QVariant(PhonyClass,&lt;value not representable as string&gt;)"/>
+  </testcase>
+  <testcase name="compareQObjects" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared QObject pointers are not the same
    Actual   (&amp;object1): QObject/&quot;object1&quot;
    Expected (&amp;object2): QObject/&quot;object2&quot;"/>
   </testcase>
-  <testcase name="compareQStringLists" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared lists differ at index 2.
+  <testcase name="compareQStringLists(empty lists)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQStringLists(equal lists)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQStringLists(last item different)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists differ at index 2.
    Actual   (opA): &quot;string3&quot;
-   Expected (opB): &quot;DIFFERS&quot;" tag="last item different"/>
-    <failure result="fail" message="Compared lists differ at index 2.
+   Expected (opB): &quot;DIFFERS&quot;"/>
+  </testcase>
+  <testcase name="compareQStringLists(second&#x002D;last item different)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists differ at index 2.
    Actual   (opA): &quot;string3&quot;
-   Expected (opB): &quot;DIFFERS&quot;" tag="second&#x002D;last item different"/>
-    <failure result="fail" message="Compared lists have different sizes.
+   Expected (opB): &quot;DIFFERS&quot;"/>
+  </testcase>
+  <testcase name="compareQStringLists(prefix)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists have different sizes.
    Actual   (opA) size: 2
-   Expected (opB) size: 1" tag="prefix"/>
-    <failure result="fail" message="Compared lists have different sizes.
+   Expected (opB) size: 1"/>
+  </testcase>
+  <testcase name="compareQStringLists(short list second)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists have different sizes.
    Actual   (opA) size: 12
-   Expected (opB) size: 1" tag="short list second"/>
-    <failure result="fail" message="Compared lists have different sizes.
+   Expected (opB) size: 1"/>
+  </testcase>
+  <testcase name="compareQStringLists(short list first)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists have different sizes.
    Actual   (opA) size: 1
-   Expected (opB) size: 12" tag="short list first"/>
+   Expected (opB) size: 12"/>
   </testcase>
-  <testcase name="compareQListInt" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared lists have different sizes.
+  <testcase name="compareQListInt(match)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQListInt(size mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists have different sizes.
    Actual   (actual) size: 2
-   Expected (expected) size: 3" tag="size mismatch"/>
-    <failure result="fail" message="Compared lists differ at index 2.
-   Actual   (actual): 4
-   Expected (expected): 3" tag="value mismatch"/>
+   Expected (expected) size: 3"/>
   </testcase>
-  <testcase name="compareQListIntToArray" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared lists have different sizes.
+  <testcase name="compareQListInt(value mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists differ at index 2.
+   Actual   (actual): 4
+   Expected (expected): 3"/>
+  </testcase>
+  <testcase name="compareQListIntToArray(match)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQListIntToArray(size mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists have different sizes.
    Actual   (actual) size: 2
-   Expected (expected) size: 3" tag="size mismatch"/>
-    <failure result="fail" message="Compared lists differ at index 2.
-   Actual   (actual): 4
-   Expected (expected): 3" tag="value mismatch"/>
+   Expected (expected) size: 3"/>
   </testcase>
-  <testcase name="compareQListIntToInitializerList" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared lists have different sizes.
+  <testcase name="compareQListIntToArray(value mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists differ at index 2.
+   Actual   (actual): 4
+   Expected (expected): 3"/>
+  </testcase>
+  <testcase name="compareQListIntToInitializerList(match)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQListIntToInitializerList(size mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists have different sizes.
    Actual   (actual) size: 2
-   Expected (ARG({1, 2, 3})) size: 3" tag="size mismatch"/>
-    <failure result="fail" message="Compared lists differ at index 2.
-   Actual   (actual): 4
-   Expected (ARG({1, 2, 3})): 3" tag="value mismatch"/>
+   Expected (ARG({1, 2, 3})) size: 3"/>
   </testcase>
-  <testcase name="compareQListDouble" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared lists differ at index 0.
+  <testcase name="compareQListIntToInitializerList(value mismatch)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists differ at index 2.
+   Actual   (actual): 4
+   Expected (ARG({1, 2, 3})): 3"/>
+  </testcase>
+  <testcase name="compareQListDouble" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared lists differ at index 0.
    Actual   (double1): 1.5
    Expected (double2): 1"/>
   </testcase>
-  <testcase name="compareQColor" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="compareQColor(Qt::yellow vs &quot;yellow&quot;)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQColor(Qt::yellow vs Qt::green)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (colorA): #ffffff00
-   Expected (colorB): #ff00ff00" tag="Qt::yellow vs Qt::green"/>
-    <failure result="fail" message="Compared values are not the same
+   Expected (colorB): #ff00ff00"/>
+  </testcase>
+  <testcase name="compareQColor(0x88ff0000 vs 0xffff0000)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (colorA): #88ff0000
-   Expected (colorB): #ffff0000" tag="0x88ff0000 vs 0xffff0000"/>
+   Expected (colorB): #ffff0000"/>
   </testcase>
-  <testcase name="compareQPixmaps" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared QPixmaps differ.
+  <testcase name="compareQPixmaps(both null)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQPixmaps(one null)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared QPixmaps differ.
    Actual   (opA).isNull(): 1
-   Expected (opB).isNull(): 0" tag="one null"/>
-    <failure result="fail" message="Compared QPixmaps differ.
+   Expected (opB).isNull(): 0"/>
+  </testcase>
+  <testcase name="compareQPixmaps(other null)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared QPixmaps differ.
    Actual   (opA).isNull(): 0
-   Expected (opB).isNull(): 1" tag="other null"/>
-    <failure result="fail" message="Compared QPixmaps differ in size.
+   Expected (opB).isNull(): 1"/>
+  </testcase>
+  <testcase name="compareQPixmaps(equal)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQPixmaps(different size)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared QPixmaps differ in size.
    Actual   (opA): 11x20
-   Expected (opB): 20x20" tag="different size"/>
-    <failure result="fail" message="Compared values are not the same" tag="different pixels"/>
-    <failure result="fail" message="Compared QPixmaps differ in device pixel ratio.
+   Expected (opB): 20x20"/>
+  </testcase>
+  <testcase name="compareQPixmaps(different pixels)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same"/>
+  </testcase>
+  <testcase name="compareQPixmaps(different dpr)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared QPixmaps differ in device pixel ratio.
    Actual   (opA): 1
-   Expected (opB): 2" tag="different dpr"/>
+   Expected (opB): 2"/>
   </testcase>
-  <testcase name="compareQImages" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared QImages differ.
+  <testcase name="compareQImages(both null)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQImages(one null)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared QImages differ.
    Actual   (opA).isNull(): 1
-   Expected (opB).isNull(): 0" tag="one null"/>
-    <failure result="fail" message="Compared QImages differ.
+   Expected (opB).isNull(): 0"/>
+  </testcase>
+  <testcase name="compareQImages(other null)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared QImages differ.
    Actual   (opA).isNull(): 0
-   Expected (opB).isNull(): 1" tag="other null"/>
-    <failure result="fail" message="Compared QImages differ in size.
+   Expected (opB).isNull(): 1"/>
+  </testcase>
+  <testcase name="compareQImages(equal)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQImages(different size)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared QImages differ in size.
    Actual   (opA): 11x20
-   Expected (opB): 20x20" tag="different size"/>
-    <failure result="fail" message="Compared QImages differ in format.
+   Expected (opB): 20x20"/>
+  </testcase>
+  <testcase name="compareQImages(different format)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared QImages differ in format.
    Actual   (opA): 6
-   Expected (opB): 3" tag="different format"/>
-    <failure result="fail" message="Compared values are not the same" tag="different pixels"/>
-    <failure result="fail" message="Compared QImages differ in device pixel ratio.
+   Expected (opB): 3"/>
+  </testcase>
+  <testcase name="compareQImages(different pixels)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same"/>
+  </testcase>
+  <testcase name="compareQImages(different dpr)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared QImages differ in device pixel ratio.
    Actual   (opA): 1
-   Expected (opB): 2" tag="different dpr"/>
+   Expected (opB): 2"/>
   </testcase>
-  <testcase name="compareQRegion" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="compareQRegion(equal&#x002D;empty)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQRegion(1&#x002D;empty)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (rA): QRegion(200x50+10+10)
-   Expected (rB): QRegion(null)" tag="1&#x002D;empty"/>
-    <failure result="fail" message="Compared values are not the same
-   Actual   (rA): QRegion(200x50+10+10)
-   Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)" tag="different lists"/>
+   Expected (rB): QRegion(null)"/>
   </testcase>
-  <testcase name="compareQVector2D" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="compareQRegion(equal)" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="compareQRegion(different lists)" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
+   Actual   (rA): QRegion(200x50+10+10)
+   Expected (rB): QRegion(2 rectangles, 50x200+100+200, 200x50+10+10)"/>
+  </testcase>
+  <testcase name="compareQVector2D" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (v2a): QVector2D(1, 2)
    Expected (v2b): QVector2D(1, 3)"/>
   </testcase>
-  <testcase name="compareQVector3D" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="compareQVector3D" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (v3a): QVector3D(1, 2, 3)
    Expected (v3b): QVector3D(1, 3, 3)"/>
   </testcase>
-  <testcase name="compareQVector4D" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="compareQVector4D" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (v4a): QVector4D(1, 2, 3, 4)
    Expected (v4b): QVector4D(1, 3, 3, 4)"/>
   </testcase>
-  <testcase name="verify" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. ()"/>
+  <testcase name="verify" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="verify2" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. (42)"/>
+  <testcase name="verify2" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. (42)"/>
   </testcase>
-  <testcase name="tryVerify" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. ()"/>
+  <testcase name="tryVerify" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="tryVerify2" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. (42)"/>
+  <testcase name="tryVerify2" classname="tst_Cmptest" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;opaqueFunc() &lt; 2&apos; returned FALSE. (42)"/>
   </testcase>
-  <testcase name="verifyExplicitOperatorBool" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="verifyExplicitOperatorBool" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Cmptest" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml
index 170a461075..202a9eaa27 100644
--- a/tests/auto/testlib/selftests/expected_commandlinedata.junitxml
+++ b/tests/auto/testlib/selftests/expected_commandlinedata.junitxml
@@ -1,22 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" tests="4" failures="0" errors="6" time="@TEST_DURATION@">
+<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="0" errors="6" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="fiveTablePasses" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data1" -->
-    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data2" -->
-    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data3" -->
-    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data4" -->
-    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data5" -->
+  <testcase name="initTestCase" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="fiveTablePasses(fiveTablePasses_data1)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(test)" -->
   </testcase>
-  <testcase name="fiveTablePasses" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="QVERIFY(test)" tag="fiveTablePasses_data1" -->
+  <testcase name="fiveTablePasses(fiveTablePasses_data2)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(test)" -->
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="fiveTablePasses(fiveTablePasses_data3)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(test)" -->
+  </testcase>
+  <testcase name="fiveTablePasses(fiveTablePasses_data4)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(test)" -->
+  </testcase>
+  <testcase name="fiveTablePasses(fiveTablePasses_data5)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(test)" -->
+  </testcase>
+  <testcase name="fiveTablePasses" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="fiveTablePasses(fiveTablePasses_data1)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(test)" -->
+  </testcase>
+  <testcase name="cleanupTestCase" classname="tst_DataTable" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[QVERIFY(test)]]>
 <![CDATA[QVERIFY(test)]]>
diff --git a/tests/auto/testlib/selftests/expected_counting.junitxml b/tests/auto/testlib/selftests/expected_counting.junitxml
index a9278ad0a4..5575d0805b 100644
--- a/tests/auto/testlib/selftests/expected_counting.junitxml
+++ b/tests/auto/testlib/selftests/expected_counting.junitxml
@@ -1,55 +1,76 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" tests="15" failures="8" errors="10" time="@TEST_DURATION@">
+<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="10" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testPassPass" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testPassSkip" result="pass" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skipping" tag="row 2" -->
+  <testcase name="initTestCase" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testPassPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testPassPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testPassSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testPassSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testPassFail" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
+  <testcase name="testPassFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testPassFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testSkipPass" result="pass" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skipping" tag="row 1" -->
+  <testcase name="testSkipPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testSkipSkip" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skipping" tag="row 1" -->
-    <!-- type="skip" message="Skipping" tag="row 2" -->
+  <testcase name="testSkipPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testSkipFail" result="fail" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skipping" tag="row 1" -->
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
+  <testcase name="testSkipSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testFailPass" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
+  <testcase name="testSkipFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testFailSkip" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
-    <!-- type="skip" message="Skipping" tag="row 2" -->
+  <testcase name="testSkipFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testFailFail" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
+  <testcase name="testFailPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testFailInInit" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Fail in init()" tag="fail"/>
+  <testcase name="testFailPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testFailSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testFailInCleanup" result="fail" time="@TEST_DURATION@">
-    <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" tag="fail" -->
-    <failure result="fail" message="Fail in cleanup()" tag="fail"/>
+  <testcase name="testFailSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testSkipInInit" result="pass" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skip in init()" tag="skip" -->
+  <testcase name="testFailFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testSkipInCleanup" result="pass" time="@TEST_DURATION@">
-    <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" tag="skip" -->
-    <!-- type="skip" message="Skip in cleanup()" tag="skip" -->
+  <testcase name="testFailFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="testFailInInit(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testFailInInit(fail)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="Fail in init()"/>
+  </testcase>
+  <testcase name="testFailInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testFailInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testFailInCleanup(fail)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" -->
+    <failure type="fail" message="Fail in cleanup()"/>
+  </testcase>
+  <testcase name="testFailInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInInit(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInInit(skip)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skip in init()" -->
+  </testcase>
+  <testcase name="testSkipInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInCleanup(skip)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" -->
+    <!-- type="skip" message="Skip in cleanup()" -->
+  </testcase>
+  <testcase name="testSkipInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Counting" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[Skipping]]>
 <![CDATA[Skipping]]>
diff --git a/tests/auto/testlib/selftests/expected_datatable.junitxml b/tests/auto/testlib/selftests/expected_datatable.junitxml
index c3db9c584d..179309d840 100644
--- a/tests/auto/testlib/selftests/expected_datatable.junitxml
+++ b/tests/auto/testlib/selftests/expected_datatable.junitxml
@@ -1,37 +1,70 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" tests="10" failures="13" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_DataTable" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="34" failures="13" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="singleTestFunction1" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="singleTestFunction2" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="fiveTablePasses" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="fiveTableFailures" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="fiveTableFailures_data 1"/>
-    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="fiveTableFailures_data 2"/>
-    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="fiveTableFailures_data 3"/>
-    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="fiveTableFailures_data 4"/>
-    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="fiveTableFailures_data 5"/>
+  <testcase name="initTestCase" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="singleTestFunction1" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="singleTestFunction2" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="fiveTablePasses(fiveTablePasses_data 1)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="fiveTablePasses(fiveTablePasses_data 2)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="fiveTablePasses(fiveTablePasses_data 3)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="fiveTablePasses(fiveTablePasses_data 4)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="fiveTablePasses(fiveTablePasses_data 5)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="fiveTableFailures(fiveTableFailures_data 1)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;test&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="startsWithFailure" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="startsWithFailure_data 1"/>
+  <testcase name="fiveTableFailures(fiveTableFailures_data 2)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;test&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="endsWithFailure" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="endsWithFailure 5"/>
+  <testcase name="fiveTableFailures(fiveTableFailures_data 3)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;test&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="failureInMiddle" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;test&apos; returned FALSE. ()" tag="failureInMiddle_data 3"/>
+  <testcase name="fiveTableFailures(fiveTableFailures_data 4)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;test&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="fiveIsolatedFailures" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;!test&apos; returned FALSE. ()" tag="fiveIsolatedFailures_data 1"/>
-    <failure result="fail" message="&apos;!test&apos; returned FALSE. ()" tag="fiveIsolatedFailures_data 2"/>
-    <failure result="fail" message="&apos;!test&apos; returned FALSE. ()" tag="fiveIsolatedFailures_data 3"/>
-    <failure result="fail" message="&apos;!test&apos; returned FALSE. ()" tag="fiveIsolatedFailures_data 4"/>
-    <failure result="fail" message="&apos;!test&apos; returned FALSE. ()" tag="fiveIsolatedFailures_data 5"/>
+  <testcase name="fiveTableFailures(fiveTableFailures_data 5)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;test&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="startsWithFailure(startsWithFailure_data 1)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;test&apos; returned FALSE. ()"/>
+  </testcase>
+  <testcase name="startsWithFailure(startsWithFailure_data 2)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="startsWithFailure(startsWithFailure_data 3)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="startsWithFailure(startsWithFailure_data 4)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="startsWithFailure(startsWithFailure_data 5)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="endsWithFailure(endsWithFailure 1)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="endsWithFailure(endsWithFailure 2)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="endsWithFailure(endsWithFailure 3)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="endsWithFailure(endsWithFailure 4)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="endsWithFailure(endsWithFailure 5)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;test&apos; returned FALSE. ()"/>
+  </testcase>
+  <testcase name="failureInMiddle(failureInMiddle_data 1)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="failureInMiddle(failureInMiddle_data 2)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="failureInMiddle(failureInMiddle_data 3)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;test&apos; returned FALSE. ()"/>
+  </testcase>
+  <testcase name="failureInMiddle(failureInMiddle_data 4)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="failureInMiddle(failureInMiddle_data 5)" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <testcase name="fiveIsolatedFailures(fiveIsolatedFailures_data 1)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;!test&apos; returned FALSE. ()"/>
+  </testcase>
+  <testcase name="fiveIsolatedFailures(fiveIsolatedFailures_data 2)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;!test&apos; returned FALSE. ()"/>
+  </testcase>
+  <testcase name="fiveIsolatedFailures(fiveIsolatedFailures_data 3)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;!test&apos; returned FALSE. ()"/>
+  </testcase>
+  <testcase name="fiveIsolatedFailures(fiveIsolatedFailures_data 4)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;!test&apos; returned FALSE. ()"/>
+  </testcase>
+  <testcase name="fiveIsolatedFailures(fiveIsolatedFailures_data 5)" classname="tst_DataTable" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;!test&apos; returned FALSE. ()"/>
+  </testcase>
+  <testcase name="cleanupTestCase" classname="tst_DataTable" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_datetime.junitxml b/tests/auto/testlib/selftests/expected_datetime.junitxml
index 607fa86122..4d69961f0d 100644
--- a/tests/auto/testlib/selftests/expected_datetime.junitxml
+++ b/tests/auto/testlib/selftests/expected_datetime.junitxml
@@ -1,24 +1,29 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_DateTime" timestamp="@TEST_START_TIME@" tests="4" failures="3" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_DateTime" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="dateTime" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="initTestCase" classname="tst_DateTime" time="@TEST_DURATION@"/>
+  <testcase name="dateTime" classname="tst_DateTime" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (local): 2000/05/03 04:03:04.000[UTC+00:02]
    Expected (utc)  : 2000/05/03 04:03:04.000[UTC]"/>
   </testcase>
-  <testcase name="qurl" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="qurl(empty urls)" classname="tst_DateTime" time="@TEST_DURATION@"/>
+  <testcase name="qurl(empty rhs)" classname="tst_DateTime" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (operandA): http://example.com
-   Expected (operandB): Invalid URL: " tag="empty rhs"/>
-    <failure result="fail" message="Compared values are not the same
-   Actual   (operandA): Invalid URL: 
-   Expected (operandB): http://example.com" tag="empty lhs"/>
+   Expected (operandB): Invalid URL: "/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="qurl(empty lhs)" classname="tst_DateTime" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
+   Actual   (operandA): Invalid URL: 
+   Expected (operandB): http://example.com"/>
+  </testcase>
+  <testcase name="qurl(same urls)" classname="tst_DateTime" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_DateTime" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml
index d92e9dcd50..fba0ecdbd3 100644
--- a/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml
+++ b/tests/auto/testlib/selftests/expected_exceptionthrow.junitxml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Exception" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_Exception" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="throwException" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Caught unhandled exception"/>
+  <testcase name="initTestCase" classname="tst_Exception" time="@TEST_DURATION@"/>
+  <testcase name="throwException" classname="tst_Exception" time="@TEST_DURATION@">
+    <failure type="fail" message="Caught unhandled exception"/>
   </testcase>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_expectfail.junitxml b/tests/auto/testlib/selftests/expected_expectfail.junitxml
index 6b70eab354..c26b9cfa8d 100644
--- a/tests/auto/testlib/selftests/expected_expectfail.junitxml
+++ b/tests/auto/testlib/selftests/expected_expectfail.junitxml
@@ -1,54 +1,68 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_ExpectFail" timestamp="@TEST_START_TIME@" tests="14" failures="6" errors="13" time="@TEST_DURATION@">
+<testsuite name="tst_ExpectFail" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="24" failures="6" errors="13" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="xfailAndContinue" result="xfail" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
+  <testcase name="xfailAndContinue" classname="tst_ExpectFail" time="@TEST_DURATION@">
     <!-- type="qdebug" message="begin" -->
     <!-- type="info" message="This should xfail" -->
     <!-- type="qdebug" message="after" -->
   </testcase>
-  <testcase name="xfailAndAbort" result="xfail" time="@TEST_DURATION@">
+  <testcase name="xfailAndAbort" classname="tst_ExpectFail" time="@TEST_DURATION@">
     <!-- type="qdebug" message="begin" -->
     <!-- type="info" message="This should xfail" -->
   </testcase>
-  <testcase name="xfailTwice" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Already expecting a fail"/>
+  <testcase name="xfailTwice" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <failure type="fail" message="Already expecting a fail"/>
   </testcase>
-  <testcase name="xfailWithQString" result="xfail" time="@TEST_DURATION@">
+  <testcase name="xfailWithQString" classname="tst_ExpectFail" time="@TEST_DURATION@">
     <!-- type="info" message="A string" -->
     <!-- type="info" message="Bug 5 (The message)" -->
   </testcase>
-  <testcase name="xfailDataDrivenWithQVerify" result="xfail" time="@TEST_DURATION@">
-    <!-- type="info" message="This test should xfail" tag="Abort" -->
-    <!-- type="info" message="This test should xfail" tag="Continue" -->
+  <testcase name="xfailDataDrivenWithQVerify(Pass 1)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
+  <testcase name="xfailDataDrivenWithQVerify(Pass 2)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
+  <testcase name="xfailDataDrivenWithQVerify(Abort)" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <!-- type="info" message="This test should xfail" -->
   </testcase>
-  <testcase name="xfailDataDrivenWithQCompare" result="xfail" time="@TEST_DURATION@">
-    <!-- type="info" message="This test should xfail" tag="Abort" -->
-    <!-- type="info" message="This test should xfail" tag="Continue" -->
+  <testcase name="xfailDataDrivenWithQVerify(Continue)" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <!-- type="info" message="This test should xfail" -->
   </testcase>
-  <testcase name="xfailOnWrongRow" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="xfailOnAnyRow" result="xfail" time="@TEST_DURATION@">
-    <!-- type="info" message="This test should xfail" tag="first row" -->
-    <!-- type="info" message="This test should xfail" tag="second row" -->
+  <testcase name="xfailDataDrivenWithQCompare(Pass 1)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
+  <testcase name="xfailDataDrivenWithQCompare(Pass 2)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
+  <testcase name="xfailDataDrivenWithQCompare(Abort)" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <!-- type="info" message="This test should xfail" -->
   </testcase>
-  <testcase name="xfailWithoutVerify" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="QEXPECT_FAIL was called without any subsequent verification statements" tag="first row"/>
-    <failure result="fail" message="QEXPECT_FAIL was called without any subsequent verification statements" tag="second row"/>
+  <testcase name="xfailDataDrivenWithQCompare(Continue)" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <!-- type="info" message="This test should xfail" -->
   </testcase>
-  <testcase name="xpass" result="xpass" time="@TEST_DURATION@">
-    <failure result="xpass" message="&apos;true&apos; returned TRUE unexpectedly. ()"/>
+  <testcase name="xfailOnWrongRow(right row)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
+  <testcase name="xfailOnAnyRow(first row)" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <!-- type="info" message="This test should xfail" -->
   </testcase>
-  <testcase name="xpassDataDrivenWithQVerify" result="xpass" time="@TEST_DURATION@">
-    <failure result="xpass" message="&apos;true&apos; returned TRUE unexpectedly. ()" tag="XPass"/>
+  <testcase name="xfailOnAnyRow(second row)" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <!-- type="info" message="This test should xfail" -->
   </testcase>
-  <testcase name="xpassDataDrivenWithQCompare" result="xpass" time="@TEST_DURATION@">
-    <failure result="xpass" message="QCOMPARE(1, 1) returned TRUE unexpectedly." tag="XPass"/>
+  <testcase name="xfailWithoutVerify(first row)" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <failure type="fail" message="QEXPECT_FAIL was called without any subsequent verification statements"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="xfailWithoutVerify(second row)" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <failure type="fail" message="QEXPECT_FAIL was called without any subsequent verification statements"/>
+  </testcase>
+  <testcase name="xpass" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <failure type="xpass" message="&apos;true&apos; returned TRUE unexpectedly. ()"/>
+  </testcase>
+  <testcase name="xpassDataDrivenWithQVerify(XPass)" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <failure type="xpass" message="&apos;true&apos; returned TRUE unexpectedly. ()"/>
+  </testcase>
+  <testcase name="xpassDataDrivenWithQVerify(Pass)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
+  <testcase name="xpassDataDrivenWithQCompare(XPass)" classname="tst_ExpectFail" time="@TEST_DURATION@">
+    <failure type="xpass" message="QCOMPARE(1, 1) returned TRUE unexpectedly."/>
+  </testcase>
+  <testcase name="xpassDataDrivenWithQCompare(Pass)" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_ExpectFail" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[begin]]>
 <![CDATA[This should xfail]]>
diff --git a/tests/auto/testlib/selftests/expected_failcleanup.junitxml b/tests/auto/testlib/selftests/expected_failcleanup.junitxml
index 36b4703670..2234e999fb 100644
--- a/tests/auto/testlib/selftests/expected_failcleanup.junitxml
+++ b/tests/auto/testlib/selftests/expected_failcleanup.junitxml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_FailCleanup" timestamp="@TEST_START_TIME@" tests="3" failures="1" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_FailCleanup" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="aTestFunction" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. (Fail inside cleanupTestCase)"/>
+  <testcase name="initTestCase" classname="tst_FailCleanup" time="@TEST_DURATION@"/>
+  <testcase name="aTestFunction" classname="tst_FailCleanup" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_FailCleanup" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. (Fail inside cleanupTestCase)"/>
   </testcase>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_faildatatype.junitxml b/tests/auto/testlib/selftests/expected_faildatatype.junitxml
index 9ca9a69030..0f7d4856cd 100644
--- a/tests/auto/testlib/selftests/expected_faildatatype.junitxml
+++ b/tests/auto/testlib/selftests/expected_faildatatype.junitxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_FailDataType" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="2" time="@TEST_DURATION@">
+<testsuite name="tst_FailDataType" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="2" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="value" result="fail" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_FailDataType" time="@TEST_DURATION@"/>
+  <testcase name="value" classname="tst_FailDataType" time="@TEST_DURATION@">
     <!-- type="qdebug" message="expected data of type &apos;QString&apos;, got &apos;bool&apos; for element 0 of data with tag &apos;bool&#x002D;as&#x002D;string&apos;" -->
     <!-- type="qfatal" message="ASSERT: &quot;false&quot; in file qtbase/src/testlib/qtestdata.cpp, line 0" -->
-    <failure result="fail" message="Received a fatal error."/>
+    <failure type="fail" message="Received a fatal error."/>
   </testcase>
   <system-out>
 <![CDATA[expected data of type 'QString', got 'bool' for element 0 of data with tag 'bool-as-string']]>
diff --git a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml
index a8263b8963..dd3a1076e1 100644
--- a/tests/auto/testlib/selftests/expected_failfetchtype.junitxml
+++ b/tests/auto/testlib/selftests/expected_failfetchtype.junitxml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_FailFetchType" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_FailFetchType" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="fetch" result="fail" time="@TEST_DURATION@">
-    <!-- type="qfatal" message="Requested type &apos;QString&apos; does not match available type &apos;bool&apos;." tag="bool" -->
-    <failure result="fail" message="Received a fatal error." tag="bool"/>
+  <testcase name="initTestCase" classname="tst_FailFetchType" time="@TEST_DURATION@"/>
+  <testcase name="fetch(bool)" classname="tst_FailFetchType" time="@TEST_DURATION@">
+    <!-- type="qfatal" message="Requested type &apos;QString&apos; does not match available type &apos;bool&apos;." -->
+    <failure type="fail" message="Received a fatal error."/>
   </testcase>
+  <system-out/>
   <system-err>
 <![CDATA[Requested type 'QString' does not match available type 'bool'.]]>
   </system-err>
diff --git a/tests/auto/testlib/selftests/expected_failinit.junitxml b/tests/auto/testlib/selftests/expected_failinit.junitxml
index 04ccad6d2b..3540f8e2a4 100644
--- a/tests/auto/testlib/selftests/expected_failinit.junitxml
+++ b/tests/auto/testlib/selftests/expected_failinit.junitxml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_FailInit" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_FailInit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()"/>
+  <testcase name="initTestCase" classname="tst_FailInit" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_FailInit" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_failinitdata.junitxml b/tests/auto/testlib/selftests/expected_failinitdata.junitxml
index c0ad679d1b..c99a7d493f 100644
--- a/tests/auto/testlib/selftests/expected_failinitdata.junitxml
+++ b/tests/auto/testlib/selftests/expected_failinitdata.junitxml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_FailInitData" timestamp="@TEST_START_TIME@" tests="1" failures="1" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_FailInitData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="1" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()"/>
+  <testcase name="initTestCase" classname="tst_FailInitData" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml
index a967cc8b3d..db7d4e8fc4 100644
--- a/tests/auto/testlib/selftests/expected_fetchbogus.junitxml
+++ b/tests/auto/testlib/selftests/expected_fetchbogus.junitxml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_FetchBogus" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_FetchBogus" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="fetchBogus" result="fail" time="@TEST_DURATION@">
-    <!-- type="qfatal" message="QFETCH: Requested testdata &apos;bubu&apos; not available, check your _data function." tag="foo" -->
-    <failure result="fail" message="Received a fatal error." tag="foo"/>
+  <testcase name="initTestCase" classname="tst_FetchBogus" time="@TEST_DURATION@"/>
+  <testcase name="fetchBogus(foo)" classname="tst_FetchBogus" time="@TEST_DURATION@">
+    <!-- type="qfatal" message="QFETCH: Requested testdata &apos;bubu&apos; not available, check your _data function." -->
+    <failure type="fail" message="Received a fatal error."/>
   </testcase>
+  <system-out/>
   <system-err>
 <![CDATA[QFETCH: Requested testdata 'bubu' not available, check your _data function.]]>
   </system-err>
diff --git a/tests/auto/testlib/selftests/expected_findtestdata.junitxml b/tests/auto/testlib/selftests/expected_findtestdata.junitxml
index 1a0eebca8e..78dbc575c2 100644
--- a/tests/auto/testlib/selftests/expected_findtestdata.junitxml
+++ b/tests/auto/testlib/selftests/expected_findtestdata.junitxml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="FindTestData" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="FindTestData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="paths" result="pass" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="FindTestData" time="@TEST_DURATION@"/>
+  <testcase name="paths" classname="FindTestData" time="@TEST_DURATION@">
     <!-- type="warn" message="testdata testfile could not be located!" -->
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="FindTestData" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err>
 <![CDATA[testdata testfile could not be located!]]>
   </system-err>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.junitxml b/tests/auto/testlib/selftests/expected_globaldata.junitxml
index d371a5affd..b1d1794680 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.junitxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.junitxml
@@ -1,63 +1,81 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_globaldata" timestamp="@TEST_START_TIME@" tests="6" failures="0" errors="43" time="@TEST_DURATION@">
+<testsuite name="tst_globaldata" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="15" failures="0" errors="43" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_globaldata" time="@TEST_DURATION@">
     <!-- type="qdebug" message="initTestCase initTestCase (null)" -->
   </testcase>
-  <testcase name="testGlobal" result="pass" time="@TEST_DURATION@">
-    <!-- type="qdebug" message="init testGlobal local=false" tag="global=false:local=false" -->
-    <!-- type="qdebug" message="global: false" tag="global=false:local=false" -->
-    <!-- type="qdebug" message="local: false" tag="global=false:local=false" -->
-    <!-- type="qdebug" message="cleanup testGlobal local=false" tag="global=false:local=false" -->
-    <!-- type="qdebug" message="init testGlobal local=true" tag="global=false:local=true" -->
-    <!-- type="qdebug" message="global: false" tag="global=false:local=true" -->
-    <!-- type="qdebug" message="local: true" tag="global=false:local=true" -->
-    <!-- type="qdebug" message="cleanup testGlobal local=true" tag="global=false:local=true" -->
-    <!-- type="qdebug" message="init testGlobal local=false" tag="global=true:local=false" -->
-    <!-- type="qdebug" message="global: true" tag="global=true:local=false" -->
-    <!-- type="qdebug" message="local: false" tag="global=true:local=false" -->
-    <!-- type="qdebug" message="cleanup testGlobal local=false" tag="global=true:local=false" -->
-    <!-- type="qdebug" message="init testGlobal local=true" tag="global=true:local=true" -->
-    <!-- type="qdebug" message="global: true" tag="global=true:local=true" -->
-    <!-- type="qdebug" message="local: true" tag="global=true:local=true" -->
-    <!-- type="qdebug" message="cleanup testGlobal local=true" tag="global=true:local=true" -->
+  <testcase name="testGlobal(global=false:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init testGlobal local=false" -->
+    <!-- type="qdebug" message="global: false" -->
+    <!-- type="qdebug" message="local: false" -->
+    <!-- type="qdebug" message="cleanup testGlobal local=false" -->
   </testcase>
-  <testcase name="skip" time="@TEST_DURATION@">
-    <!-- type="skip" message="skipping" tag="global=false" -->
+  <testcase name="testGlobal(global=false:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init testGlobal local=true" -->
+    <!-- type="qdebug" message="global: false" -->
+    <!-- type="qdebug" message="local: true" -->
+    <!-- type="qdebug" message="cleanup testGlobal local=true" -->
   </testcase>
-  <testcase name="skipLocal" time="@TEST_DURATION@">
-    <!-- type="qdebug" message="init skipLocal local=false" tag="global=false:local=false" -->
-    <!-- type="skip" message="skipping" tag="global=false:local=false" -->
-    <!-- type="qdebug" message="cleanup skipLocal local=false" tag="global=false:local=false" -->
-    <!-- type="qdebug" message="init skipLocal local=true" tag="global=false:local=true" -->
-    <!-- type="skip" message="skipping" tag="global=false:local=true" -->
-    <!-- type="qdebug" message="cleanup skipLocal local=true" tag="global=false:local=true" -->
-    <!-- type="qdebug" message="init skipLocal local=false" tag="global=true:local=false" -->
-    <!-- type="skip" message="skipping" tag="global=true:local=false" -->
-    <!-- type="qdebug" message="cleanup skipLocal local=false" tag="global=true:local=false" -->
-    <!-- type="qdebug" message="init skipLocal local=true" tag="global=true:local=true" -->
-    <!-- type="skip" message="skipping" tag="global=true:local=true" -->
-    <!-- type="qdebug" message="cleanup skipLocal local=true" tag="global=true:local=true" -->
+  <testcase name="testGlobal(global=true:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init testGlobal local=false" -->
+    <!-- type="qdebug" message="global: true" -->
+    <!-- type="qdebug" message="local: false" -->
+    <!-- type="qdebug" message="cleanup testGlobal local=false" -->
   </testcase>
-  <testcase name="skipSingle" result="pass" time="@TEST_DURATION@">
-    <!-- type="qdebug" message="init skipSingle local=false" tag="global=false:local=false" -->
-    <!-- type="qdebug" message="global: false local: false" tag="global=false:local=false" -->
-    <!-- type="qdebug" message="cleanup skipSingle local=false" tag="global=false:local=false" -->
-    <!-- type="qdebug" message="init skipSingle local=true" tag="global=false:local=true" -->
-    <!-- type="skip" message="Skipping" tag="global=false:local=true" -->
-    <!-- type="qdebug" message="cleanup skipSingle local=true" tag="global=false:local=true" -->
-    <!-- type="qdebug" message="init skipSingle local=false" tag="global=true:local=false" -->
-    <!-- type="skip" message="Skipping" tag="global=true:local=false" -->
-    <!-- type="qdebug" message="cleanup skipSingle local=false" tag="global=true:local=false" -->
-    <!-- type="qdebug" message="init skipSingle local=true" tag="global=true:local=true" -->
-    <!-- type="qdebug" message="global: true local: true" tag="global=true:local=true" -->
-    <!-- type="qdebug" message="cleanup skipSingle local=true" tag="global=true:local=true" -->
+  <testcase name="testGlobal(global=true:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init testGlobal local=true" -->
+    <!-- type="qdebug" message="global: true" -->
+    <!-- type="qdebug" message="local: true" -->
+    <!-- type="qdebug" message="cleanup testGlobal local=true" -->
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@">
+  <testcase name="skip" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="skip" message="skipping" -->
+  </testcase>
+  <testcase name="skipLocal(global=false:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init skipLocal local=false" -->
+    <!-- type="skip" message="skipping" -->
+    <!-- type="qdebug" message="cleanup skipLocal local=false" -->
+  </testcase>
+  <testcase name="skipLocal(global=false:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init skipLocal local=true" -->
+    <!-- type="skip" message="skipping" -->
+    <!-- type="qdebug" message="cleanup skipLocal local=true" -->
+  </testcase>
+  <testcase name="skipLocal(global=true:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init skipLocal local=false" -->
+    <!-- type="skip" message="skipping" -->
+    <!-- type="qdebug" message="cleanup skipLocal local=false" -->
+  </testcase>
+  <testcase name="skipLocal(global=true:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init skipLocal local=true" -->
+    <!-- type="skip" message="skipping" -->
+    <!-- type="qdebug" message="cleanup skipLocal local=true" -->
+  </testcase>
+  <testcase name="skipSingle(global=false:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init skipSingle local=false" -->
+    <!-- type="qdebug" message="global: false local: false" -->
+    <!-- type="qdebug" message="cleanup skipSingle local=false" -->
+  </testcase>
+  <testcase name="skipSingle(global=false:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init skipSingle local=true" -->
+    <!-- type="skip" message="Skipping" -->
+    <!-- type="qdebug" message="cleanup skipSingle local=true" -->
+  </testcase>
+  <testcase name="skipSingle(global=true:local=false)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init skipSingle local=false" -->
+    <!-- type="skip" message="Skipping" -->
+    <!-- type="qdebug" message="cleanup skipSingle local=false" -->
+  </testcase>
+  <testcase name="skipSingle(global=true:local=true)" classname="tst_globaldata" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init skipSingle local=true" -->
+    <!-- type="qdebug" message="global: true local: true" -->
+    <!-- type="qdebug" message="cleanup skipSingle local=true" -->
+  </testcase>
+  <testcase name="cleanupTestCase" classname="tst_globaldata" time="@TEST_DURATION@">
     <!-- type="qdebug" message="cleanupTestCase cleanupTestCase (null)" -->
   </testcase>
   <system-out>
diff --git a/tests/auto/testlib/selftests/expected_junit.junitxml b/tests/auto/testlib/selftests/expected_junit.junitxml
index 787c422251..57e449238c 100644
--- a/tests/auto/testlib/selftests/expected_junit.junitxml
+++ b/tests/auto/testlib/selftests/expected_junit.junitxml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_JUnit" timestamp="@TEST_START_TIME@" tests="9" failures="3" errors="5" time="@TEST_DURATION@">
+<testsuite name="tst_JUnit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="3" errors="5" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testFunc1" result="pass" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_JUnit" time="@TEST_DURATION@"/>
+  <testcase name="testFunc1" classname="tst_JUnit" time="@TEST_DURATION@">
     <!-- type="qwarn" message="just a qWarning() !" -->
   </testcase>
-  <testcase name="testFunc2" result="fail" time="@TEST_DURATION@">
+  <testcase name="testFunc2" classname="tst_JUnit" time="@TEST_DURATION@">
     <!-- type="qdebug" message="a qDebug() call with comment&#x002D;ending stuff &#x002D;&#x002D;&gt;" -->
-    <failure result="fail" message="Compared values are not the same
+    <failure type="fail" message="Compared values are not the same
    Actual   (2): 2
    Expected (3): 3"/>
   </testcase>
-  <testcase name="testFunc3" time="@TEST_DURATION@">
+  <testcase name="testFunc3" classname="tst_JUnit" time="@TEST_DURATION@">
     <!-- type="skip" message="skipping this function!" -->
   </testcase>
-  <testcase name="testFunc4" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="a forced failure!"/>
+  <testcase name="testFunc4" classname="tst_JUnit" time="@TEST_DURATION@">
+    <failure type="fail" message="a forced failure!"/>
   </testcase>
-  <testcase name="testFunc5" result="xfail" time="@TEST_DURATION@">
+  <testcase name="testFunc5" classname="tst_JUnit" time="@TEST_DURATION@">
     <!-- type="info" message="this failure is expected" -->
   </testcase>
-  <testcase name="testFunc6" result="xfail" time="@TEST_DURATION@">
+  <testcase name="testFunc6" classname="tst_JUnit" time="@TEST_DURATION@">
     <!-- type="info" message="this failure is also expected" -->
   </testcase>
-  <testcase name="testFunc7" result="xpass" time="@TEST_DURATION@">
-    <failure result="xpass" message="&apos;true&apos; returned TRUE unexpectedly. ()"/>
+  <testcase name="testFunc7" classname="tst_JUnit" time="@TEST_DURATION@">
+    <failure type="xpass" message="&apos;true&apos; returned TRUE unexpectedly. ()"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_JUnit" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[a qDebug() call with comment-ending stuff -->]]>
 <![CDATA[skipping this function!]]>
diff --git a/tests/auto/testlib/selftests/expected_keyboard.junitxml b/tests/auto/testlib/selftests/expected_keyboard.junitxml
index 22e41dff3a..f3f15f8ea3 100644
--- a/tests/auto/testlib/selftests/expected_keyboard.junitxml
+++ b/tests/auto/testlib/selftests/expected_keyboard.junitxml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Keyboard" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_Keyboard" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="keyPressAndRelease" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_Keyboard" time="@TEST_DURATION@"/>
+  <testcase name="keyPressAndRelease" classname="tst_Keyboard" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Keyboard" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_longstring.junitxml b/tests/auto/testlib/selftests/expected_longstring.junitxml
index c84eaddd6a..cdb953a861 100644
--- a/tests/auto/testlib/selftests/expected_longstring.junitxml
+++ b/tests/auto/testlib/selftests/expected_longstring.junitxml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_LongString" timestamp="@TEST_START_TIME@" tests="3" failures="1" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_LongString" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="failWithLongString" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.
+  <testcase name="initTestCase" classname="tst_LongString" time="@TEST_DURATION@"/>
+  <testcase name="failWithLongString" classname="tst_LongString" time="@TEST_DURATION@">
+    <failure type="fail" message="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui.
 
 Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia.
 
@@ -17,6 +17,7 @@ Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. M
 
 Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus. Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis. Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus. Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas."/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_LongString" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml
index 02d84648dc..7f01c69eba 100644
--- a/tests/auto/testlib/selftests/expected_maxwarnings.junitxml
+++ b/tests/auto/testlib/selftests/expected_maxwarnings.junitxml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="MaxWarnings" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="2002" time="@TEST_DURATION@">
+<testsuite name="MaxWarnings" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="2002" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="warn" result="pass" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="MaxWarnings" time="@TEST_DURATION@"/>
+  <testcase name="warn" classname="MaxWarnings" time="@TEST_DURATION@">
     <!-- type="qwarn" message="0" -->
     <!-- type="qwarn" message="1" -->
     <!-- type="qwarn" message="2" -->
@@ -2010,7 +2010,7 @@
     <!-- type="qwarn" message="2000" -->
     <!-- type="system" message="Maximum amount of warnings exceeded. Use &#x002D;maxwarnings to override." -->
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="MaxWarnings" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[Maximum amount of warnings exceeded. Use -maxwarnings to override.]]>
   </system-out>
diff --git a/tests/auto/testlib/selftests/expected_multiexec.junitxml b/tests/auto/testlib/selftests/expected_multiexec.junitxml
index de4e05c5d8..dfc8e2afb3 100644
--- a/tests/auto/testlib/selftests/expected_multiexec.junitxml
+++ b/tests/auto/testlib/selftests/expected_multiexec.junitxml
@@ -1,60 +1,65 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="nothing" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <testcase name="nothing" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="nothing" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <testcase name="nothing" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="nothing" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <testcase name="nothing" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="nothing" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <testcase name="nothing" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_Nothing" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="nothing" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <testcase name="nothing" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Nothing" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml
index 1f6ce0ba06..f8d90cc14c 100644
--- a/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml
+++ b/tests/auto/testlib/selftests/expected_pairdiagnostics.junitxml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_PairDiagnostics" timestamp="@TEST_START_TIME@" tests="4" failures="2" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_PairDiagnostics" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="4" failures="2" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testQPair" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="initTestCase" classname="tst_PairDiagnostics" time="@TEST_DURATION@"/>
+  <testcase name="testQPair" classname="tst_PairDiagnostics" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (pair1): std::pair(1, 1)
    Expected (pair2): std::pair(1, 2)"/>
   </testcase>
-  <testcase name="testStdPair" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="testStdPair" classname="tst_PairDiagnostics" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (pair1): std::pair(1, 1)
    Expected (pair2): std::pair(1, 2)"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_PairDiagnostics" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_pass.junitxml b/tests/auto/testlib/selftests/expected_pass.junitxml
index d35c798499..406e1c1f0d 100644
--- a/tests/auto/testlib/selftests/expected_pass.junitxml
+++ b/tests/auto/testlib/selftests/expected_pass.junitxml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Pass" timestamp="@TEST_START_TIME@" tests="5" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_Pass" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testNumber1" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testNumber2" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testNumber3" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_Pass" time="@TEST_DURATION@"/>
+  <testcase name="testNumber1" classname="tst_Pass" time="@TEST_DURATION@"/>
+  <testcase name="testNumber2" classname="tst_Pass" time="@TEST_DURATION@"/>
+  <testcase name="testNumber3" classname="tst_Pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Pass" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml
index 441562fa5a..a066bf6a5f 100644
--- a/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml
+++ b/tests/auto/testlib/selftests/expected_qexecstringlist.junitxml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_QExecStringList" timestamp="@TEST_START_TIME@" tests="5" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_QExecStringList" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testA" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testB" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testC" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
+  <testcase name="testA" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
+  <testcase name="testB(Data1)" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
+  <testcase name="testB(Data2)" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
+  <testcase name="testB(Data3)" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
+  <testcase name="testC" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_QExecStringList" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
 ********* Start testing of tst_QExecStringList *********
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.junitxml b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
index b1aa68cc67..37e4b38844 100644
--- a/tests/auto/testlib/selftests/expected_signaldumper.junitxml
+++ b/tests/auto/testlib/selftests/expected_signaldumper.junitxml
@@ -1,141 +1,157 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Signaldumper" timestamp="@TEST_START_TIME@" tests="13" failures="0" errors="124" time="@TEST_DURATION@">
+<testsuite name="tst_Signaldumper" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="21" failures="0" errors="124" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="noConnections" result="pass" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_Signaldumper" time="@TEST_DURATION@"/>
+  <testcase name="noConnections" classname="tst_Signaldumper" time="@TEST_DURATION@">
     <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
     <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
   </testcase>
-  <testcase name="oneSlot" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+  <testcase name="oneSlot(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
   </testcase>
-  <testcase name="oneSlotOldSyntax" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+  <testcase name="oneSlot(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
   </testcase>
-  <testcase name="twoSlots" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+  <testcase name="oneSlotOldSyntax(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
   </testcase>
-  <testcase name="twoSlotsOldSyntax" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
+  <testcase name="oneSlotOldSyntax(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
   </testcase>
-  <testcase name="signalForwarding" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
-    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
+  <testcase name="twoSlots(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
   </testcase>
-  <testcase name="signalForwardingOldSyntax" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) nestedSignal()" tag="direct" -->
-    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)" tag="direct" -->
-    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) nestedSignal()" tag="direct" -->
-    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
+  <testcase name="twoSlots(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
   </testcase>
-  <testcase name="slotEmittingSignal" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
-    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
+  <testcase name="twoSlotsOldSyntax(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
   </testcase>
-  <testcase name="slotEmittingSignalOldSyntax" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="direct" -->
-    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) emitSecondSignal()" tag="direct" -->
-    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="direct" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="direct" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" tag="queued" -->
-    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" tag="queued" -->
-    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" tag="queued" -->
+  <testcase name="twoSlotsOldSyntax(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
   </testcase>
-  <testcase name="variousTypes" result="pass" time="@TEST_DURATION@">
+  <testcase name="signalForwarding(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+  </testcase>
+  <testcase name="signalForwarding(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+  </testcase>
+  <testcase name="signalForwardingOldSyntax(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) nestedSignal()" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) nestedSignal()" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+  </testcase>
+  <testcase name="signalForwardingOldSyntax(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+  </testcase>
+  <testcase name="slotEmittingSignal(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+  </testcase>
+  <testcase name="slotEmittingSignal(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+  </testcase>
+  <testcase name="slotEmittingSignalOldSyntax(direct)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="    Slot: SignalSlotClass(_POINTER_) emitSecondSignal()" -->
+    <!-- type="info" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+  </testcase>
+  <testcase name="slotEmittingSignalOldSyntax(queued)" classname="tst_Signaldumper" time="@TEST_DURATION@">
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
+    <!-- type="info" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" -->
+    <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" -->
+  </testcase>
+  <testcase name="variousTypes" classname="tst_Signaldumper" time="@TEST_DURATION@">
     <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))" -->
     <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&amp;)@_POINTER_)" -->
     <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))" -->
@@ -149,10 +165,10 @@
     <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" -->
     <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" -->
   </testcase>
-  <testcase name="deletingSender" result="pass" time="@TEST_DURATION@">
+  <testcase name="deletingSender" classname="tst_Signaldumper" time="@TEST_DURATION@">
     <!-- type="info" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" -->
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Signaldumper" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
 <![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
diff --git a/tests/auto/testlib/selftests/expected_silent.junitxml b/tests/auto/testlib/selftests/expected_silent.junitxml
index c39fee5bf7..0130b4700e 100644
--- a/tests/auto/testlib/selftests/expected_silent.junitxml
+++ b/tests/auto/testlib/selftests/expected_silent.junitxml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Silent" timestamp="@TEST_START_TIME@" tests="7" failures="3" errors="9" time="@TEST_DURATION@">
+<testsuite name="tst_Silent" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="9" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="pass" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="skip" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_Silent" time="@TEST_DURATION@"/>
+  <testcase name="pass" classname="tst_Silent" time="@TEST_DURATION@"/>
+  <testcase name="skip" classname="tst_Silent" time="@TEST_DURATION@">
     <!-- type="skip" message="This test should skip" -->
   </testcase>
-  <testcase name="fail" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. (This test should fail)"/>
+  <testcase name="fail" classname="tst_Silent" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. (This test should fail)"/>
   </testcase>
-  <testcase name="xfail" result="xfail" time="@TEST_DURATION@">
+  <testcase name="xfail" classname="tst_Silent" time="@TEST_DURATION@">
     <!-- type="info" message="This test should XFAIL" -->
   </testcase>
-  <testcase name="xpass" result="xpass" time="@TEST_DURATION@">
-    <failure result="xpass" message="&apos;true&apos; returned TRUE unexpectedly. (This test should XPASS)"/>
+  <testcase name="xpass" classname="tst_Silent" time="@TEST_DURATION@">
+    <failure type="xpass" message="&apos;true&apos; returned TRUE unexpectedly. (This test should XPASS)"/>
   </testcase>
-  <testcase name="messages" result="fail" time="@TEST_DURATION@">
+  <testcase name="messages" classname="tst_Silent" time="@TEST_DURATION@">
     <!-- type="qwarn" message="This is a warning that should not appear in silent test output" -->
     <!-- type="warn" message="This is an internal testlib warning that should not appear in silent test output" -->
     <!-- type="qdebug" message="This is a debug message that should not appear in silent test output" -->
@@ -27,7 +27,7 @@
     <!-- type="qinfo" message="This is an info message that should not appear in silent test output" -->
     <!-- type="info" message="This is an internal testlib info message that should not appear in silent test output" -->
     <!-- type="qfatal" message="This is a fatal error message that should still appear in silent test output" -->
-    <failure result="fail" message="Received a fatal error."/>
+    <failure type="fail" message="Received a fatal error."/>
   </testcase>
   <system-out>
 <![CDATA[This test should skip]]>
diff --git a/tests/auto/testlib/selftests/expected_singleskip.junitxml b/tests/auto/testlib/selftests/expected_singleskip.junitxml
index 2949553671..c596de7560 100644
--- a/tests/auto/testlib/selftests/expected_singleskip.junitxml
+++ b/tests/auto/testlib/selftests/expected_singleskip.junitxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_SingleSkip" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_SingleSkip" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="myTest" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_SingleSkip" time="@TEST_DURATION@"/>
+  <testcase name="myTest" classname="tst_SingleSkip" time="@TEST_DURATION@">
     <!-- type="skip" message="skipping test" -->
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_SingleSkip" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[skipping test]]>
   </system-out>
diff --git a/tests/auto/testlib/selftests/expected_skip.junitxml b/tests/auto/testlib/selftests/expected_skip.junitxml
index f4213a723f..f99358d10d 100644
--- a/tests/auto/testlib/selftests/expected_skip.junitxml
+++ b/tests/auto/testlib/selftests/expected_skip.junitxml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Skip" timestamp="@TEST_START_TIME@" tests="5" failures="0" errors="4" time="@TEST_DURATION@">
+<testsuite name="tst_Skip" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="6" failures="0" errors="4" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="test" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_Skip" time="@TEST_DURATION@"/>
+  <testcase name="test" classname="tst_Skip" time="@TEST_DURATION@">
     <!-- type="skip" message="skipping all" -->
   </testcase>
-  <testcase name="emptytest" time="@TEST_DURATION@">
+  <testcase name="emptytest" classname="tst_Skip" time="@TEST_DURATION@">
     <!-- type="skip" message="skipping all" -->
   </testcase>
-  <testcase name="singleSkip" result="pass" time="@TEST_DURATION@">
-    <!-- type="skip" message="skipping one" tag="local 1" -->
-    <!-- type="qdebug" message="this line should only be reached once (true)" tag="local 2" -->
+  <testcase name="singleSkip(local 1)" classname="tst_Skip" time="@TEST_DURATION@">
+    <!-- type="skip" message="skipping one" -->
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="singleSkip(local 2)" classname="tst_Skip" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="this line should only be reached once (true)" -->
+  </testcase>
+  <testcase name="cleanupTestCase" classname="tst_Skip" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[skipping all]]>
 <![CDATA[skipping all]]>
diff --git a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml
index a7d7fd0bb4..c576d43f2e 100644
--- a/tests/auto/testlib/selftests/expected_skipcleanup.junitxml
+++ b/tests/auto/testlib/selftests/expected_skipcleanup.junitxml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_SkipCleanup" timestamp="@TEST_START_TIME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_SkipCleanup" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="3" failures="0" errors="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="aTestFunction" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_SkipCleanup" time="@TEST_DURATION@"/>
+  <testcase name="aTestFunction" classname="tst_SkipCleanup" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_SkipCleanup" time="@TEST_DURATION@">
     <!-- type="skip" message="Skip inside cleanupTestCase." -->
   </testcase>
   <system-out>
diff --git a/tests/auto/testlib/selftests/expected_skipinit.junitxml b/tests/auto/testlib/selftests/expected_skipinit.junitxml
index 2213d11cfe..a4a028f172 100644
--- a/tests/auto/testlib/selftests/expected_skipinit.junitxml
+++ b/tests/auto/testlib/selftests/expected_skipinit.junitxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_SkipInit" timestamp="@TEST_START_TIME@" tests="2" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_SkipInit" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="0" errors="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_SkipInit" time="@TEST_DURATION@">
     <!-- type="skip" message="Skip inside initTestCase. This should skip all tests in the class." -->
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_SkipInit" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[Skip inside initTestCase. This should skip all tests in the class.]]>
   </system-out>
diff --git a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml
index 4ae6af2399..f2c8e92b45 100644
--- a/tests/auto/testlib/selftests/expected_skipinitdata.junitxml
+++ b/tests/auto/testlib/selftests/expected_skipinitdata.junitxml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_SkipInitData" timestamp="@TEST_START_TIME@" tests="1" failures="0" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_SkipInitData" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="1" failures="0" errors="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_SkipInitData" time="@TEST_DURATION@">
     <!-- type="skip" message="Skip inside initTestCase_data. This should skip all tests in the class." -->
   </testcase>
   <system-out>
diff --git a/tests/auto/testlib/selftests/expected_sleep.junitxml b/tests/auto/testlib/selftests/expected_sleep.junitxml
index 871fdf32c0..1997144f21 100644
--- a/tests/auto/testlib/selftests/expected_sleep.junitxml
+++ b/tests/auto/testlib/selftests/expected_sleep.junitxml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Sleep" timestamp="@TEST_START_TIME@" tests="4" failures="0" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_Sleep" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="4" failures="0" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="sleep" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="wait" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="initTestCase" classname="tst_Sleep" time="@TEST_DURATION@"/>
+  <testcase name="sleep" classname="tst_Sleep" time="@TEST_DURATION@"/>
+  <testcase name="wait" classname="tst_Sleep" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Sleep" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_strcmp.junitxml b/tests/auto/testlib/selftests/expected_strcmp.junitxml
index 6d87553356..fb753a34ea 100644
--- a/tests/auto/testlib/selftests/expected_strcmp.junitxml
+++ b/tests/auto/testlib/selftests/expected_strcmp.junitxml
@@ -1,41 +1,41 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_StrCmp" timestamp="@TEST_START_TIME@" tests="8" failures="5" errors="3" time="@TEST_DURATION@">
+<testsuite name="tst_StrCmp" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="8" failures="5" errors="3" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="compareCharStars" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="compareByteArray" result="fail" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_StrCmp" time="@TEST_DURATION@"/>
+  <testcase name="compareCharStars" classname="tst_StrCmp" time="@TEST_DURATION@"/>
+  <testcase name="compareByteArray" classname="tst_StrCmp" time="@TEST_DURATION@">
     <!-- type="info" message="Next test should fail" -->
     <!-- type="info" message="Next test should fail" -->
     <!-- type="info" message="Next test should fail" -->
-    <failure result="fail" message="Compared values are not the same
+    <failure type="fail" message="Compared values are not the same
    Actual   (a): &quot;BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB&quot;...
    Expected (b): &quot;AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA&quot;..."/>
   </testcase>
-  <testcase name="failByteArray" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="failByteArray" classname="tst_StrCmp" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (QByteArray(&quot;abc&quot;)): &quot;abc&quot;
    Expected (QByteArray(&quot;cba&quot;)): &quot;cba&quot;"/>
   </testcase>
-  <testcase name="failByteArrayNull" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="failByteArrayNull" classname="tst_StrCmp" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (QByteArray(&quot;foo&quot;)): &quot;foo&quot;
    Expected (QByteArray())     : &quot;&quot;"/>
   </testcase>
-  <testcase name="failByteArrayEmpty" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="failByteArrayEmpty" classname="tst_StrCmp" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (QByteArray(&quot;&quot;))   : &quot;&quot;
    Expected (QByteArray(&quot;foo&quot;)): &quot;foo&quot;"/>
   </testcase>
-  <testcase name="failByteArraySingleChars" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="failByteArraySingleChars" classname="tst_StrCmp" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (QByteArray(&quot;6&quot;)): &quot;6&quot;
    Expected (QByteArray(&quot;7&quot;)): &quot;7&quot;"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_StrCmp" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[Next test should fail]]>
 <![CDATA[Next test should fail]]>
diff --git a/tests/auto/testlib/selftests/expected_subtest.junitxml b/tests/auto/testlib/selftests/expected_subtest.junitxml
index 36a919d5b2..8d0cfe001b 100644
--- a/tests/auto/testlib/selftests/expected_subtest.junitxml
+++ b/tests/auto/testlib/selftests/expected_subtest.junitxml
@@ -1,55 +1,63 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Subtest" timestamp="@TEST_START_TIME@" tests="5" failures="2" errors="31" time="@TEST_DURATION@">
+<testsuite name="tst_Subtest" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="9" failures="2" errors="31" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_Subtest" time="@TEST_DURATION@">
     <!-- type="qdebug" message="initTestCase initTestCase (null)" -->
   </testcase>
-  <testcase name="test1" result="pass" time="@TEST_DURATION@">
+  <testcase name="test1" classname="tst_Subtest" time="@TEST_DURATION@">
     <!-- type="qdebug" message="init test1 (null)" -->
     <!-- type="qdebug" message="test1 test1 (null)" -->
     <!-- type="qdebug" message="cleanup test1 (null)" -->
   </testcase>
-  <testcase name="test2" result="pass" time="@TEST_DURATION@">
+  <testcase name="test2(data0)" classname="tst_Subtest" time="@TEST_DURATION@">
     <!-- type="qdebug" message="test2_data test2 (null)" -->
     <!-- type="qdebug" message="test2_data end" -->
-    <!-- type="qdebug" message="init test2 data0" tag="data0" -->
-    <!-- type="qdebug" message="test2 test2 data0" tag="data0" -->
-    <!-- type="qdebug" message="test2 end" tag="data0" -->
-    <!-- type="qdebug" message="cleanup test2 data0" tag="data0" -->
-    <!-- type="qdebug" message="init test2 data1" tag="data1" -->
-    <!-- type="qdebug" message="test2 test2 data1" tag="data1" -->
-    <!-- type="qdebug" message="test2 end" tag="data1" -->
-    <!-- type="qdebug" message="cleanup test2 data1" tag="data1" -->
-    <!-- type="qdebug" message="init test2 data2" tag="data2" -->
-    <!-- type="qdebug" message="test2 test2 data2" tag="data2" -->
-    <!-- type="qdebug" message="test2 end" tag="data2" -->
-    <!-- type="qdebug" message="cleanup test2 data2" tag="data2" -->
+    <!-- type="qdebug" message="init test2 data0" -->
+    <!-- type="qdebug" message="test2 test2 data0" -->
+    <!-- type="qdebug" message="test2 end" -->
+    <!-- type="qdebug" message="cleanup test2 data0" -->
   </testcase>
-  <testcase name="test3" result="fail" time="@TEST_DURATION@">
+  <testcase name="test2(data1)" classname="tst_Subtest" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init test2 data1" -->
+    <!-- type="qdebug" message="test2 test2 data1" -->
+    <!-- type="qdebug" message="test2 end" -->
+    <!-- type="qdebug" message="cleanup test2 data1" -->
+  </testcase>
+  <testcase name="test2(data2)" classname="tst_Subtest" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init test2 data2" -->
+    <!-- type="qdebug" message="test2 test2 data2" -->
+    <!-- type="qdebug" message="test2 end" -->
+    <!-- type="qdebug" message="cleanup test2 data2" -->
+  </testcase>
+  <testcase name="test3(data0)" classname="tst_Subtest" time="@TEST_DURATION@">
     <!-- type="qdebug" message="test3_data test3 (null)" -->
     <!-- type="qdebug" message="test3_data end" -->
-    <!-- type="qdebug" message="init test3 data0" tag="data0" -->
-    <!-- type="qdebug" message="test2 test3 data0" tag="data0" -->
-    <!-- type="qdebug" message="test2 end" tag="data0" -->
-    <!-- type="qdebug" message="cleanup test3 data0" tag="data0" -->
-    <!-- type="qdebug" message="init test3 data1" tag="data1" -->
-    <!-- type="qdebug" message="test2 test3 data1" tag="data1" -->
-    <failure result="fail" message="Compared values are not the same
-   Actual   (str)              : &quot;hello1&quot;
-   Expected (QString(&quot;hello0&quot;)): &quot;hello0&quot;" tag="data1"/>
-    <!-- type="qdebug" message="cleanup test3 data1" tag="data1" -->
-    <!-- type="qdebug" message="init test3 data2" tag="data2" -->
-    <!-- type="qdebug" message="test2 test3 data2" tag="data2" -->
-    <failure result="fail" message="Compared values are not the same
-   Actual   (str)              : &quot;hello2&quot;
-   Expected (QString(&quot;hello0&quot;)): &quot;hello0&quot;" tag="data2"/>
-    <!-- type="qdebug" message="cleanup test3 data2" tag="data2" -->
+    <!-- type="qdebug" message="init test3 data0" -->
+    <!-- type="qdebug" message="test2 test3 data0" -->
+    <!-- type="qdebug" message="test2 end" -->
+    <!-- type="qdebug" message="cleanup test3 data0" -->
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@">
+  <testcase name="test3(data1)" classname="tst_Subtest" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init test3 data1" -->
+    <!-- type="qdebug" message="test2 test3 data1" -->
+    <failure type="fail" message="Compared values are not the same
+   Actual   (str)              : &quot;hello1&quot;
+   Expected (QString(&quot;hello0&quot;)): &quot;hello0&quot;"/>
+    <!-- type="qdebug" message="cleanup test3 data1" -->
+  </testcase>
+  <testcase name="test3(data2)" classname="tst_Subtest" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="init test3 data2" -->
+    <!-- type="qdebug" message="test2 test3 data2" -->
+    <failure type="fail" message="Compared values are not the same
+   Actual   (str)              : &quot;hello2&quot;
+   Expected (QString(&quot;hello0&quot;)): &quot;hello0&quot;"/>
+    <!-- type="qdebug" message="cleanup test3 data2" -->
+  </testcase>
+  <testcase name="cleanupTestCase" classname="tst_Subtest" time="@TEST_DURATION@">
     <!-- type="qdebug" message="cleanupTestCase cleanupTestCase (null)" -->
   </testcase>
   <system-out>
diff --git a/tests/auto/testlib/selftests/expected_testlib.junitxml b/tests/auto/testlib/selftests/expected_testlib.junitxml
index 0172787ed1..c26fbe54e1 100644
--- a/tests/auto/testlib/selftests/expected_testlib.junitxml
+++ b/tests/auto/testlib/selftests/expected_testlib.junitxml
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_TestLib" timestamp="@TEST_START_TIME@" tests="5" failures="1" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_TestLib" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="10" failures="1" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="basics" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared QObject pointers are not the same"/>
+  <testcase name="initTestCase" classname="tst_TestLib" time="@TEST_DURATION@"/>
+  <testcase name="basics" classname="tst_TestLib" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared QObject pointers are not the same"/>
   </testcase>
-  <testcase name="delays" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="reals" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="delays" classname="tst_TestLib" time="@TEST_DURATION@"/>
+  <testcase name="reals(zero)" classname="tst_TestLib" time="@TEST_DURATION@"/>
+  <testcase name="reals(self&#x002D;qQNaN)" classname="tst_TestLib" time="@TEST_DURATION@"/>
+  <testcase name="reals(self&#x002D;qInf)" classname="tst_TestLib" time="@TEST_DURATION@"/>
+  <testcase name="reals(infineg)" classname="tst_TestLib" time="@TEST_DURATION@"/>
+  <testcase name="reals(Sin(turn/4))" classname="tst_TestLib" time="@TEST_DURATION@"/>
+  <testcase name="reals(Cos(turn/2))" classname="tst_TestLib" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_TestLib" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml
index cc56990dee..23ea603c37 100644
--- a/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml
+++ b/tests/auto/testlib/selftests/expected_tuplediagnostics.junitxml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_TupleDiagnostics" timestamp="@TEST_START_TIME@" tests="5" failures="2" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_TupleDiagnostics" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="5" failures="2" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testEmptyTuple" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testSimpleTuple" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="initTestCase" classname="tst_TupleDiagnostics" time="@TEST_DURATION@"/>
+  <testcase name="testEmptyTuple" classname="tst_TupleDiagnostics" time="@TEST_DURATION@"/>
+  <testcase name="testSimpleTuple" classname="tst_TupleDiagnostics" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (std::tuple&lt;int&gt;{1}): std::tuple(1)
    Expected (std::tuple&lt;int&gt;{2}): std::tuple(2)"/>
   </testcase>
-  <testcase name="testTuple" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Compared values are not the same
+  <testcase name="testTuple" classname="tst_TupleDiagnostics" time="@TEST_DURATION@">
+    <failure type="fail" message="Compared values are not the same
    Actual   (tuple1): std::tuple(42, &apos;Y&apos;, &quot;tuple1&quot;)
    Expected (tuple2): std::tuple(42, &apos;Y&apos;, &quot;tuple2&quot;)"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_TupleDiagnostics" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_verbose1.junitxml b/tests/auto/testlib/selftests/expected_verbose1.junitxml
index a9278ad0a4..5575d0805b 100644
--- a/tests/auto/testlib/selftests/expected_verbose1.junitxml
+++ b/tests/auto/testlib/selftests/expected_verbose1.junitxml
@@ -1,55 +1,76 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" tests="15" failures="8" errors="10" time="@TEST_DURATION@">
+<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="10" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testPassPass" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testPassSkip" result="pass" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skipping" tag="row 2" -->
+  <testcase name="initTestCase" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testPassPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testPassPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testPassSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testPassSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testPassFail" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
+  <testcase name="testPassFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testPassFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testSkipPass" result="pass" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skipping" tag="row 1" -->
+  <testcase name="testSkipPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testSkipSkip" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skipping" tag="row 1" -->
-    <!-- type="skip" message="Skipping" tag="row 2" -->
+  <testcase name="testSkipPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testSkipFail" result="fail" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skipping" tag="row 1" -->
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
+  <testcase name="testSkipSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testFailPass" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
+  <testcase name="testSkipFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testFailSkip" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
-    <!-- type="skip" message="Skipping" tag="row 2" -->
+  <testcase name="testSkipFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testFailFail" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
+  <testcase name="testFailPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testFailInInit" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Fail in init()" tag="fail"/>
+  <testcase name="testFailPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testFailSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testFailInCleanup" result="fail" time="@TEST_DURATION@">
-    <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" tag="fail" -->
-    <failure result="fail" message="Fail in cleanup()" tag="fail"/>
+  <testcase name="testFailSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testSkipInInit" result="pass" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skip in init()" tag="skip" -->
+  <testcase name="testFailFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testSkipInCleanup" result="pass" time="@TEST_DURATION@">
-    <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" tag="skip" -->
-    <!-- type="skip" message="Skip in cleanup()" tag="skip" -->
+  <testcase name="testFailFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="testFailInInit(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testFailInInit(fail)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="Fail in init()"/>
+  </testcase>
+  <testcase name="testFailInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testFailInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testFailInCleanup(fail)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" -->
+    <failure type="fail" message="Fail in cleanup()"/>
+  </testcase>
+  <testcase name="testFailInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInInit(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInInit(skip)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skip in init()" -->
+  </testcase>
+  <testcase name="testSkipInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInCleanup(skip)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" -->
+    <!-- type="skip" message="Skip in cleanup()" -->
+  </testcase>
+  <testcase name="testSkipInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Counting" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[Skipping]]>
 <![CDATA[Skipping]]>
diff --git a/tests/auto/testlib/selftests/expected_verbose2.junitxml b/tests/auto/testlib/selftests/expected_verbose2.junitxml
index 408c71425c..0c7a46c8ec 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.junitxml
+++ b/tests/auto/testlib/selftests/expected_verbose2.junitxml
@@ -1,74 +1,100 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" tests="15" failures="8" errors="28" time="@TEST_DURATION@">
+<testsuite name="tst_Counting" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="32" failures="8" errors="28" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testPassPass" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="QVERIFY(true)" tag="row 1" -->
-    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 1" -->
-    <!-- type="info" message="QVERIFY(true)" tag="row 2" -->
-    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 2" -->
+  <testcase name="initTestCase" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testPassPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(true)" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
   </testcase>
-  <testcase name="testPassSkip" result="pass" time="@TEST_DURATION@">
-    <!-- type="info" message="QVERIFY(true)" tag="row 1" -->
-    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 1" -->
-    <!-- type="skip" message="Skipping" tag="row 2" -->
+  <testcase name="testPassPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(true)" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
   </testcase>
-  <testcase name="testPassFail" result="fail" time="@TEST_DURATION@">
-    <!-- type="info" message="QVERIFY(true)" tag="row 1" -->
-    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 1" -->
-    <!-- type="info" message="QVERIFY(false)" tag="row 2" -->
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
+  <testcase name="testPassSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(true)" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
   </testcase>
-  <testcase name="testSkipPass" result="pass" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skipping" tag="row 1" -->
-    <!-- type="info" message="QVERIFY(true)" tag="row 2" -->
-    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 2" -->
+  <testcase name="testPassSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testSkipSkip" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skipping" tag="row 1" -->
-    <!-- type="skip" message="Skipping" tag="row 2" -->
+  <testcase name="testPassFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(true)" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
   </testcase>
-  <testcase name="testSkipFail" result="fail" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skipping" tag="row 1" -->
-    <!-- type="info" message="QVERIFY(false)" tag="row 2" -->
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
+  <testcase name="testPassFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(false)" -->
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testFailPass" result="fail" time="@TEST_DURATION@">
-    <!-- type="info" message="QVERIFY(false)" tag="row 1" -->
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
-    <!-- type="info" message="QVERIFY(true)" tag="row 2" -->
-    <!-- type="info" message="QCOMPARE(2 + 1, 3)" tag="row 2" -->
+  <testcase name="testSkipPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testFailSkip" result="fail" time="@TEST_DURATION@">
-    <!-- type="info" message="QVERIFY(false)" tag="row 1" -->
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
-    <!-- type="skip" message="Skipping" tag="row 2" -->
+  <testcase name="testSkipPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(true)" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
   </testcase>
-  <testcase name="testFailFail" result="fail" time="@TEST_DURATION@">
-    <!-- type="info" message="QVERIFY(false)" tag="row 1" -->
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 1"/>
-    <!-- type="info" message="QVERIFY(false)" tag="row 2" -->
-    <failure result="fail" message="&apos;false&apos; returned FALSE. ()" tag="row 2"/>
+  <testcase name="testSkipSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testFailInInit" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Fail in init()" tag="fail"/>
+  <testcase name="testSkipSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testFailInCleanup" result="fail" time="@TEST_DURATION@">
-    <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" tag="fail" -->
-    <failure result="fail" message="Fail in cleanup()" tag="fail"/>
+  <testcase name="testSkipFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
   </testcase>
-  <testcase name="testSkipInInit" result="pass" time="@TEST_DURATION@">
-    <!-- type="skip" message="Skip in init()" tag="skip" -->
+  <testcase name="testSkipFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(false)" -->
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="testSkipInCleanup" result="pass" time="@TEST_DURATION@">
-    <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" tag="skip" -->
-    <!-- type="skip" message="Skip in cleanup()" tag="skip" -->
+  <testcase name="testFailPass(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(false)" -->
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="testFailPass(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(true)" -->
+    <!-- type="info" message="QCOMPARE(2 + 1, 3)" -->
+  </testcase>
+  <testcase name="testFailSkip(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(false)" -->
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
+  </testcase>
+  <testcase name="testFailSkip(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skipping" -->
+  </testcase>
+  <testcase name="testFailFail(row 1)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(false)" -->
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
+  </testcase>
+  <testcase name="testFailFail(row 2)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="info" message="QVERIFY(false)" -->
+    <failure type="fail" message="&apos;false&apos; returned FALSE. ()"/>
+  </testcase>
+  <testcase name="testFailInInit(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testFailInInit(fail)" classname="tst_Counting" time="@TEST_DURATION@">
+    <failure type="fail" message="Fail in init()"/>
+  </testcase>
+  <testcase name="testFailInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testFailInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testFailInCleanup(fail)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="This test function should execute and then QFAIL in cleanup()" -->
+    <failure type="fail" message="Fail in cleanup()"/>
+  </testcase>
+  <testcase name="testFailInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInInit(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInInit(skip)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="skip" message="Skip in init()" -->
+  </testcase>
+  <testcase name="testSkipInInit(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInCleanup(before)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="testSkipInCleanup(skip)" classname="tst_Counting" time="@TEST_DURATION@">
+    <!-- type="qdebug" message="This test function should execute and then QSKIP in cleanup()" -->
+    <!-- type="skip" message="Skip in cleanup()" -->
+  </testcase>
+  <testcase name="testSkipInCleanup(after)" classname="tst_Counting" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_Counting" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[QVERIFY(true)]]>
 <![CDATA[QCOMPARE(2 + 1, 3)]]>
diff --git a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml
index 2de587b4c6..1ad839080d 100644
--- a/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml
+++ b/tests/auto/testlib/selftests/expected_verifyexceptionthrown.junitxml
@@ -1,32 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_VerifyExceptionThrown" timestamp="@TEST_START_TIME@" tests="11" failures="6" errors="0" time="@TEST_DURATION@">
+<testsuite name="tst_VerifyExceptionThrown" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="11" failures="6" errors="0" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testCorrectStdTypes" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testCorrectStdExceptions" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testCorrectMyExceptions" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testFailInt" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Expected exception of type double to be thrown but unknown exception caught"/>
+  <testcase name="initTestCase" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"/>
+  <testcase name="testCorrectStdTypes" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"/>
+  <testcase name="testCorrectStdExceptions" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"/>
+  <testcase name="testCorrectMyExceptions" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"/>
+  <testcase name="testFailInt" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@">
+    <failure type="fail" message="Expected exception of type double to be thrown but unknown exception caught"/>
   </testcase>
-  <testcase name="testFailStdString" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Expected exception of type char* to be thrown but unknown exception caught"/>
+  <testcase name="testFailStdString" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@">
+    <failure type="fail" message="Expected exception of type char* to be thrown but unknown exception caught"/>
   </testcase>
-  <testcase name="testFailStdRuntimeError" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error"/>
+  <testcase name="testFailStdRuntimeError" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@">
+    <failure type="fail" message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: logic error"/>
   </testcase>
-  <testcase name="testFailMyException" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error"/>
+  <testcase name="testFailMyException" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@">
+    <failure type="fail" message="Expected exception of type MyBaseException to be thrown but std::exception caught with message: logic error"/>
   </testcase>
-  <testcase name="testFailMyDerivedException" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException"/>
+  <testcase name="testFailMyDerivedException" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@">
+    <failure type="fail" message="Expected exception of type std::runtime_error to be thrown but std::exception caught with message: MyDerivedException"/>
   </testcase>
-  <testcase name="testFailNoException" result="fail" time="@TEST_DURATION@">
-    <failure result="fail" message="Expected exception of type std::exception to be thrown but no exception caught"/>
+  <testcase name="testFailNoException" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@">
+    <failure type="fail" message="Expected exception of type std::exception to be thrown but no exception caught"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="cleanupTestCase" classname="tst_VerifyExceptionThrown" time="@TEST_DURATION@"/>
+  <system-out/>
   <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_warnings.junitxml b/tests/auto/testlib/selftests/expected_warnings.junitxml
index 8d49705972..328e2fab06 100644
--- a/tests/auto/testlib/selftests/expected_warnings.junitxml
+++ b/tests/auto/testlib/selftests/expected_warnings.junitxml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Warnings" timestamp="@TEST_START_TIME@" tests="6" failures="4" errors="17" time="@TEST_DURATION@">
+<testsuite name="tst_Warnings" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="4" errors="17" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="testWarnings" result="pass" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_Warnings" time="@TEST_DURATION@"/>
+  <testcase name="testWarnings" classname="tst_Warnings" time="@TEST_DURATION@">
     <!-- type="qwarn" message="Warning" -->
     <!-- type="qwarn" message="Warning" -->
     <!-- type="qdebug" message="Debug" -->
@@ -18,24 +18,26 @@
     <!-- type="qdebug" message="Bubublabla" -->
     <!-- type="qwarn" message="Babablabla" -->
   </testcase>
-  <testcase name="testMissingWarnings" result="fail" time="@TEST_DURATION@">
+  <testcase name="testMissingWarnings" classname="tst_Warnings" time="@TEST_DURATION@">
     <!-- type="info" message="Did not receive message: &quot;Warning0&quot;" -->
     <!-- type="info" message="Did not receive message: &quot;Warning1&quot;" -->
-    <failure result="fail" message="Not all expected messages were received"/>
+    <failure type="fail" message="Not all expected messages were received"/>
   </testcase>
-  <testcase name="testMissingWarningsRegularExpression" result="fail" time="@TEST_DURATION@">
+  <testcase name="testMissingWarningsRegularExpression" classname="tst_Warnings" time="@TEST_DURATION@">
     <!-- type="info" message="Did not receive any message matching: &quot;Warning\s\d&quot;" -->
-    <failure result="fail" message="Not all expected messages were received"/>
+    <failure type="fail" message="Not all expected messages were received"/>
   </testcase>
-  <testcase name="testMissingWarningsWithData" result="fail" time="@TEST_DURATION@">
-    <!-- type="info" message="Did not receive message: &quot;Warning0&quot;" tag="first row" -->
-    <!-- type="info" message="Did not receive message: &quot;Warning1&quot;" tag="first row" -->
-    <failure result="fail" message="Not all expected messages were received" tag="first row"/>
-    <!-- type="info" message="Did not receive message: &quot;Warning0&quot;" tag="second row" -->
-    <!-- type="info" message="Did not receive message: &quot;Warning1&quot;" tag="second row" -->
-    <failure result="fail" message="Not all expected messages were received" tag="second row"/>
+  <testcase name="testMissingWarningsWithData(first row)" classname="tst_Warnings" time="@TEST_DURATION@">
+    <!-- type="info" message="Did not receive message: &quot;Warning0&quot;" -->
+    <!-- type="info" message="Did not receive message: &quot;Warning1&quot;" -->
+    <failure type="fail" message="Not all expected messages were received"/>
   </testcase>
-  <testcase name="cleanupTestCase" result="pass" time="@TEST_DURATION@"/>
+  <testcase name="testMissingWarningsWithData(second row)" classname="tst_Warnings" time="@TEST_DURATION@">
+    <!-- type="info" message="Did not receive message: &quot;Warning0&quot;" -->
+    <!-- type="info" message="Did not receive message: &quot;Warning1&quot;" -->
+    <failure type="fail" message="Not all expected messages were received"/>
+  </testcase>
+  <testcase name="cleanupTestCase" classname="tst_Warnings" time="@TEST_DURATION@"/>
   <system-out>
 <![CDATA[Debug]]>
 <![CDATA[Debug]]>
diff --git a/tests/auto/testlib/selftests/expected_watchdog.junitxml b/tests/auto/testlib/selftests/expected_watchdog.junitxml
index 8fc2fd4873..e862d4c358 100644
--- a/tests/auto/testlib/selftests/expected_watchdog.junitxml
+++ b/tests/auto/testlib/selftests/expected_watchdog.junitxml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Watchdog" timestamp="@TEST_START_TIME@" tests="2" failures="1" errors="1" time="@TEST_DURATION@">
+<testsuite name="tst_Watchdog" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="2" failures="1" errors="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtBuild" value=""/>
   </properties>
-  <testcase name="initTestCase" result="pass" time="@TEST_DURATION@"/>
-  <testcase name="delay" result="fail" time="@TEST_DURATION@">
+  <testcase name="initTestCase" classname="tst_Watchdog" time="@TEST_DURATION@"/>
+  <testcase name="delay" classname="tst_Watchdog" time="@TEST_DURATION@">
     <!-- type="qfatal" message="Test function timed out" -->
-    <failure result="fail" message="Received a fatal error."/>
+    <failure type="fail" message="Received a fatal error."/>
   </testcase>
+  <system-out/>
   <system-err>
 <![CDATA[Test function timed out]]>
   </system-err>
diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py
index fb1b7ee96c..7dd9aa4576 100755
--- a/tests/auto/testlib/selftests/generate_expected_output.py
+++ b/tests/auto/testlib/selftests/generate_expected_output.py
@@ -116,6 +116,7 @@ class Cleaner (object):
             (r'(Config: Using QtTest library).*', r'\1'), # txt
             (r'( *<QtBuild)>[^<]+</QtBuild>', r'\1/>'), # xml, lightxml
             (r'(<property name="QtBuild" value=")[^"]+"', r'\1"'), # junitxml
+            (r'(<testsuite .*? hostname=")[^"]+(".*>)', r'\1@HOSTNAME@\2'), # junit
             # Line numbers in source files:
             (r'(ASSERT: ("|&quot;).*("|&quot;) in file .*, line) \d+', r'\1 0'), # lightxml
             (r'(Loc: \[[^[\]()]+)\(\d+\)', r'\1(0)'), # txt
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 3643f4d4d3..c5ae337629 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -236,6 +236,8 @@ bool compareOutput(const QString &logger, const QString &subdir,
             actualLine.replace(timestampRegex, "timestamp=\"@TEST_START_TIME@\"");
             static QRegularExpression timeRegex("time=\".*?\"");
             actualLine.replace(timeRegex, "time=\"@TEST_DURATION@\"");
+            static QRegularExpression hostnameRegex("hostname=\".*?\"");
+            actualLine.replace(hostnameRegex, "hostname=\"@HOSTNAME@\"");
         }
 
         // Special handling for ignoring _FILE_ and _LINE_ if logger is teamcity