diff --git a/tests/auto/testlib/selftests/blacklisted/BLACKLIST b/tests/auto/testlib/selftests/blacklisted/BLACKLIST
index a923c11416..d652129db3 100644
--- a/tests/auto/testlib/selftests/blacklisted/BLACKLIST
+++ b/tests/auto/testlib/selftests/blacklisted/BLACKLIST
@@ -1,8 +1,7 @@
 obscure # no such platform; is ignored
-*
 
 [pass]
-!*
+*
 
 [skip]
 *
@@ -15,6 +14,3 @@ obscure # no such platform; is ignored
 
 [xpass]
 *
-
-[messages]
-*
diff --git a/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp b/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
index 86f445b926..0ac6ae19f4 100644
--- a/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
+++ b/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
@@ -40,13 +40,9 @@ private slots:
     void fail();
     void xfail();
     void xpass();
-
-    // This test function must be last, as it calls qFatal().
-    void messages();
 };
 
-// All the tests below except pass() have been blacklisted in blacklisted/BLACKLIST
-// Contrast with ../silent/, for the same tests without blacklisting but with -silent
+// All the tests below have been blacklisted in blacklisted/BLACKLIST
 
 void tst_Blacklisted::pass()
 {
@@ -75,35 +71,5 @@ void tst_Blacklisted::xpass()
     QVERIFY2(true, "This test should BXPASS");
 }
 
-#ifndef Q_OS_WIN
-#include <signal.h>
-#include <setjmp.h>
-
-static jmp_buf state;
-static void abort_handler(int)
-{
-    longjmp(state, 1);
-}
-#endif
-
-void tst_Blacklisted::messages()
-{
-    qWarning("This is a warning that should not appear in silent test output");
-    QTestLog::warn("This is an internal testlib warning that should not appear in silent test output", __FILE__, __LINE__);
-    qDebug("This is a debug message that should not appear in silent test output");
-    qCritical("This is a critical message that should not appear in silent test output");
-    qInfo("This is an info message that should not appear in silent test output");
-    QTestLog::info("This is an internal testlib info message that should not appear in silent test output", __FILE__, __LINE__);
-
-#ifndef Q_OS_WIN
-    // We're testing qFatal, but we don't want to actually std::abort() !
-    auto prior = signal(SIGABRT, abort_handler);
-    if (setjmp(state))
-        signal(SIGABRT, prior);
-    else
-#endif
-        qFatal("This is a fatal error message that should still appear in silent test output");
-}
-
 QTEST_MAIN(tst_Blacklisted)
 #include "tst_blacklisted.moc"
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.junitxml b/tests/auto/testlib/selftests/expected_blacklisted.junitxml
index cf32c0fa55..0051659da9 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.junitxml
+++ b/tests/auto/testlib/selftests/expected_blacklisted.junitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite name="tst_Blacklisted" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="3" errors="0" skipped="1" time="@TEST_DURATION@">
+<testsuite name="tst_Blacklisted" timestamp="@TEST_START_TIME@" hostname="@HOSTNAME@" tests="7" failures="2" errors="0" skipped="1" time="@TEST_DURATION@">
   <properties>
     <property name="QTestVersion" value="@INSERT_QT_VERSION_HERE@"/>
     <property name="QtVersion" value="@INSERT_QT_VERSION_HERE@"/>
@@ -13,24 +13,7 @@
   <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" -->
-    <!-- type="system" message="This is a critical message that should not appear in silent test output" -->
-    <!-- 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" -->
-  </testcase>
-  <system-out>
-<![CDATA[This is a debug message that should not appear in silent test output]]>
-<![CDATA[This is a critical message that should not appear in silent test output]]>
-<![CDATA[This is an info message that should not appear in silent test output]]>
-<![CDATA[This is an internal testlib info message that should not appear in silent test output]]>
-  </system-out>
-  <system-err>
-<![CDATA[This is a warning that should not appear in silent test output]]>
-<![CDATA[This is an internal testlib warning that should not appear in silent test output]]>
-<![CDATA[This is a fatal error message that should still appear in silent test output]]>
-  </system-err>
+  <testcase name="cleanupTestCase" classname="tst_Blacklisted" time="@TEST_DURATION@"/>
+  <system-out/>
+  <system-err/>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.lightxml b/tests/auto/testlib/selftests/expected_blacklisted.lightxml
index a692badea1..c05977661e 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.lightxml
+++ b/tests/auto/testlib/selftests/expected_blacklisted.lightxml
@@ -36,31 +36,8 @@
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
-<TestFunction name="messages">
-<Message type="qwarn" file="" line="0">
-    <Description><![CDATA[This is a warning that should not appear in silent test output]]></Description>
-</Message>
-<Message type="warn" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
-    <Description><![CDATA[This is an internal testlib warning that should not appear in silent test output]]></Description>
-</Message>
-<Message type="qdebug" file="" line="0">
-    <Description><![CDATA[This is a debug message that should not appear in silent test output]]></Description>
-</Message>
-<Message type="system" file="" line="0">
-    <Description><![CDATA[This is a critical message that should not appear in silent test output]]></Description>
-</Message>
-<Message type="qinfo" file="" line="0">
-    <Description><![CDATA[This is an info message that should not appear in silent test output]]></Description>
-</Message>
-<Message type="info" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
-    <Description><![CDATA[This is an internal testlib info message that should not appear in silent test output]]></Description>
-</Message>
-<Message type="qfatal" file="" line="0">
-    <Description><![CDATA[This is a fatal error message that should still appear in silent test output]]></Description>
-</Message>
-<Incident type="bfail" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
-    <Description><![CDATA[Received a fatal error.]]></Description>
-</Incident>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
 <Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.tap b/tests/auto/testlib/selftests/expected_blacklisted.tap
index 9d589a6552..fee7750a12 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.tap
+++ b/tests/auto/testlib/selftests/expected_blacklisted.tap
@@ -23,21 +23,8 @@ not ok 6 - xfail() # TODO This test should BXFAIL then BPASS
   line: 0
   ...
 ok 7 - xpass() # TODO 'true' returned TRUE unexpectedly. (This test should BXPASS)
-# This is a warning that should not appear in silent test output
-# This is an internal testlib warning that should not appear in silent test output
-# This is a debug message that should not appear in silent test output
-# This is a critical message that should not appear in silent test output
-# This is an info message that should not appear in silent test output
-# This is an internal testlib info message that should not appear in silent test output
-# This is a fatal error message that should still appear in silent test output
-not ok 8 - messages() # TODO Received a fatal error.
-  ---
-  # Received a fatal error.
-  at: tst_Blacklisted::messages() (qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp:0)
-  file: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp
-  line: 0
-  ...
+ok 8 - cleanupTestCase()
 1..8
 # tests 8
-# pass 1
+# pass 2
 # fail 0
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.teamcity b/tests/auto/testlib/selftests/expected_blacklisted.teamcity
index 42b75b752b..ffdd02c9c2 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.teamcity
+++ b/tests/auto/testlib/selftests/expected_blacklisted.teamcity
@@ -11,7 +11,6 @@
 ##teamcity[testFinished name='xfail()' flowId='tst_Blacklisted']
 ##teamcity[testStarted name='xpass()' flowId='tst_Blacklisted']
 ##teamcity[testFinished name='xpass()' flowId='tst_Blacklisted']
-##teamcity[testStarted name='messages()' flowId='tst_Blacklisted']
-##teamcity[testStdOut name='messages()' out='QWARN: This is a warning that should not appear in silent test output|nWARNING |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]: This is an internal testlib warning that should not appear in silent test output|nQDEBUG: This is a debug message that should not appear in silent test output|nQSYSTEM: This is a critical message that should not appear in silent test output|nQINFO: This is an info message that should not appear in silent test output|nINFO |[Loc: qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)|]: This is an internal testlib info message that should not appear in silent test output|nQFATAL: This is a fatal error message that should still appear in silent test output' flowId='tst_Blacklisted']
-##teamcity[testFinished name='messages()' flowId='tst_Blacklisted']
+##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Blacklisted']
+##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Blacklisted']
 ##teamcity[testSuiteFinished name='tst_Blacklisted' flowId='tst_Blacklisted']
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.txt b/tests/auto/testlib/selftests/expected_blacklisted.txt
index 89085e2f56..62a2d11ed2 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.txt
+++ b/tests/auto/testlib/selftests/expected_blacklisted.txt
@@ -11,16 +11,6 @@ BXFAIL : tst_Blacklisted::xfail() This test should BXFAIL then BPASS
 BPASS  : tst_Blacklisted::xfail()
 BXPASS : tst_Blacklisted::xpass() 'true' returned TRUE unexpectedly. (This test should BXPASS)
    Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)]
-QWARN  : tst_Blacklisted::messages() This is a warning that should not appear in silent test output
-WARNING: tst_Blacklisted::messages() This is an internal testlib warning that should not appear in silent test output
-   Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)]
-QDEBUG : tst_Blacklisted::messages() This is a debug message that should not appear in silent test output
-QSYSTEM: tst_Blacklisted::messages() This is a critical message that should not appear in silent test output
-QINFO  : tst_Blacklisted::messages() This is an info message that should not appear in silent test output
-INFO   : tst_Blacklisted::messages() This is an internal testlib info message that should not appear in silent test output
-   Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)]
-QFATAL : tst_Blacklisted::messages() This is a fatal error message that should still appear in silent test output
-BFAIL  : tst_Blacklisted::messages() Received a fatal error.
-   Loc: [qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp(0)]
-Totals: 1 passed, 0 failed, 1 skipped, 6 blacklisted, 0ms
+PASS   : tst_Blacklisted::cleanupTestCase()
+Totals: 2 passed, 0 failed, 1 skipped, 5 blacklisted, 0ms
 ********* Finished testing of tst_Blacklisted *********
diff --git a/tests/auto/testlib/selftests/expected_blacklisted.xml b/tests/auto/testlib/selftests/expected_blacklisted.xml
index bfd42f4214..c23ab177f6 100644
--- a/tests/auto/testlib/selftests/expected_blacklisted.xml
+++ b/tests/auto/testlib/selftests/expected_blacklisted.xml
@@ -38,31 +38,8 @@
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
-<TestFunction name="messages">
-<Message type="qwarn" file="" line="0">
-    <Description><![CDATA[This is a warning that should not appear in silent test output]]></Description>
-</Message>
-<Message type="warn" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
-    <Description><![CDATA[This is an internal testlib warning that should not appear in silent test output]]></Description>
-</Message>
-<Message type="qdebug" file="" line="0">
-    <Description><![CDATA[This is a debug message that should not appear in silent test output]]></Description>
-</Message>
-<Message type="system" file="" line="0">
-    <Description><![CDATA[This is a critical message that should not appear in silent test output]]></Description>
-</Message>
-<Message type="qinfo" file="" line="0">
-    <Description><![CDATA[This is an info message that should not appear in silent test output]]></Description>
-</Message>
-<Message type="info" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
-    <Description><![CDATA[This is an internal testlib info message that should not appear in silent test output]]></Description>
-</Message>
-<Message type="qfatal" file="" line="0">
-    <Description><![CDATA[This is a fatal error message that should still appear in silent test output]]></Description>
-</Message>
-<Incident type="bfail" file="qtbase/tests/auto/testlib/selftests/blacklisted/tst_blacklisted.cpp" line="0">
-    <Description><![CDATA[Received a fatal error.]]></Description>
-</Incident>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
     <Duration msecs="0"/>
 </TestFunction>
 <Duration msecs="0"/>