Update for failures only on dev branch. Use general platform names

This patch was generated with tooling from patchset 31 of
https://codereview.qt-project.org/c/qt/qtqa/+/267034 in interactive
mode. General platform names were chosen if greater than 60% of the
currently active platforms of a given type in COIN recently failed.

Change-Id: Ia4bde7f0ec422bbb727dc9d7151295159094f146
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

34 files changed, 74 insertions, 316 deletions

diff --git a/tests/auto/corelib/animation/qpauseanimation/BLACKLIST b/tests/auto/corelib/animation/qpauseanimation/BLACKLIST
index 53372ce9ae..33cd53d788 100644
--- a/tests/auto/corelib/animation/qpauseanimation/BLACKLIST
+++ b/tests/auto/corelib/animation/qpauseanimation/BLACKLIST
@@ -1,9 +1,5 @@
 [pauseAndPropertyAnimations]
-osx-10.12
-osx-10.14
-osx-10.13
+osx
 [multipleSequentialGroups]
-osx-10.12
-osx-10.14
-osx-10.13
+osx
 
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST b/tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST
index 9b210b0d5f..457499591d 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST
+++ b/tests/auto/corelib/io/qfilesystemwatcher/BLACKLIST
@@ -1,9 +1,7 @@
 # QTBUG-33574 QTBUG-30943
 [signalsEmittedAfterFileMoved]
-windows-10 msvc-2017
-windows-10 msvc-2019
-windows-10 msvc-2015
 windows-7sp1
+windows-10
 [watchFileAndItsDirectory:native backend-testfile]
 osx
 windows
diff --git a/tests/auto/corelib/io/qprocess/BLACKLIST b/tests/auto/corelib/io/qprocess/BLACKLIST
index aa9fdab64d..682bcbc60c 100644
--- a/tests/auto/corelib/io/qprocess/BLACKLIST
+++ b/tests/auto/corelib/io/qprocess/BLACKLIST
@@ -2,6 +2,5 @@
 redhatenterpriselinuxworkstation-6.6
 # QTBUG-48455
 [fileWriterProcess]
-windows-10 msvc-2015
 windows-10 msvc-2017
 
diff --git a/tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST b/tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST
index 4c9fe53c14..569880e1db 100644
--- a/tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST
+++ b/tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST
@@ -1,4 +1,3 @@
 [elapsed]
-windows-10 msvc-2015
 osx-10.13
-windows-10 msvc-2017
+windows-10
diff --git a/tests/auto/corelib/kernel/qsocketnotifier/BLACKLIST b/tests/auto/corelib/kernel/qsocketnotifier/BLACKLIST
index f3b7fc97b1..f2e5e78592 100644
--- a/tests/auto/corelib/kernel/qsocketnotifier/BLACKLIST
+++ b/tests/auto/corelib/kernel/qsocketnotifier/BLACKLIST
@@ -1,4 +1,3 @@
 [unexpectedDisconnection]
-osx-10.12
-windows-10 msvc-2015
 windows-7sp1
+windows-10 msvc-2015
diff --git a/tests/auto/corelib/kernel/qtimer/BLACKLIST b/tests/auto/corelib/kernel/qtimer/BLACKLIST
deleted file mode 100644
index dc8b8987e5..0000000000
--- a/tests/auto/corelib/kernel/qtimer/BLACKLIST
+++ /dev/null
@@ -1,9 +0,0 @@
-[remainingTime]
-osx-10.12
-osx-10.14
-osx-10.13
-windows-10 msvc-2017
-[basic_chrono]
-osx-10.14
-osx-10.13
-
diff --git a/tests/auto/corelib/serialization/qtextstream/BLACKLIST b/tests/auto/corelib/serialization/qtextstream/BLACKLIST
index b8c1b742f4..674569e204 100644
--- a/tests/auto/corelib/serialization/qtextstream/BLACKLIST
+++ b/tests/auto/corelib/serialization/qtextstream/BLACKLIST
@@ -1,4 +1,3 @@
 [stillOpenWhenAtEnd]
-windows-10 msvc-2017
-winrt
 windows-7sp1
+winrt
diff --git a/tests/auto/corelib/thread/qsemaphore/BLACKLIST b/tests/auto/corelib/thread/qsemaphore/BLACKLIST
index f61f4c1a3b..d7af5c420b 100644
--- a/tests/auto/corelib/thread/qsemaphore/BLACKLIST
+++ b/tests/auto/corelib/thread/qsemaphore/BLACKLIST
@@ -1,6 +1,5 @@
 [tryAcquireWithTimeout]
-osx-10.12
-osx-10.13
+osx
 [tryAcquireWithTimeout:0.2s]
 windows
 osx-10.12
diff --git a/tests/auto/corelib/thread/qthread/BLACKLIST b/tests/auto/corelib/thread/qthread/BLACKLIST
index 87538a1048..c683154da1 100644
--- a/tests/auto/corelib/thread/qthread/BLACKLIST
+++ b/tests/auto/corelib/thread/qthread/BLACKLIST
@@ -1,7 +1,5 @@
 [wait3_slowDestructor]
-windows-10 msvc-2015
-windows-7sp1
-windows-10 msvc-2017
+windows-10
 [sleep]
 windows-7sp1
 
diff --git a/tests/auto/corelib/thread/qthreadpool/BLACKLIST b/tests/auto/corelib/thread/qthreadpool/BLACKLIST
index e4f2fcd822..b8c1f3bf3f 100644
--- a/tests/auto/corelib/thread/qthreadpool/BLACKLIST
+++ b/tests/auto/corelib/thread/qthreadpool/BLACKLIST
@@ -1,7 +1,4 @@
 [expiryTimeoutRace]
-rhel-7.6
 opensuse-leap
-osx-10.13
-ubuntu-18.04
-osx-10.12
-opensuse-42.3
+ubuntu
+rhel
diff --git a/tests/auto/corelib/tools/qtimeline/BLACKLIST b/tests/auto/corelib/tools/qtimeline/BLACKLIST
index b60cab31fa..9794b0059f 100644
--- a/tests/auto/corelib/tools/qtimeline/BLACKLIST
+++ b/tests/auto/corelib/tools/qtimeline/BLACKLIST
@@ -1,8 +1,6 @@
 [interpolation]
-osx-10.12
 windows-10 msvc-2015
-osx-10.13
-windows-7sp1
+osx
 [frameRate]
 osx-10.12
 osx-10.13
diff --git a/tests/auto/gui/kernel/qguitimer/BLACKLIST b/tests/auto/gui/kernel/qguitimer/BLACKLIST
deleted file mode 100644
index 6ab715b922..0000000000
--- a/tests/auto/gui/kernel/qguitimer/BLACKLIST
+++ /dev/null
@@ -1,8 +0,0 @@
-[basic_chrono]
-osx-10.13
-[remainingTime]
-osx-10.12
-windows-10 msvc-2015
-osx-10.14
-osx-10.13
-
diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST
index 1bb3917948..27463adf99 100644
--- a/tests/auto/gui/kernel/qwindow/BLACKLIST
+++ b/tests/auto/gui/kernel/qwindow/BLACKLIST
@@ -1,7 +1,5 @@
 [positioning]
 opensuse-leap
-ubuntu-16.04
-opensuse-42.3
 [positioning:default]
 linux
 osx-10.12 ci
@@ -9,24 +7,17 @@ winrt
 [positioning:fake]
 osx-10.12 ci
 [modalWithChildWindow]
-ubuntu-16.04
-opensuse-leap
 # QTBUG-66851
 # QTBUG-69160
-opensuse-42.3
+opensuse-leap
 [setVisible]
 # QTBUG-69154
 android
 [modalWindowEnterEventOnHide_QTBUG35109]
-ubuntu-16.04
-osx-10.11
-osx-10.13
-osx-10.14
-osx-10.12
+osx
 [spuriousMouseMove]
 # QTBUG-69162
-windows-10 msvc-2015
-windows-10 msvc-2017
+windows-10
 [testInputEvents]
 rhel-7.4
 [exposeEventOnShrink_QTBUG54040]
diff --git a/tests/auto/network/access/qabstractnetworkcache/BLACKLIST b/tests/auto/network/access/qabstractnetworkcache/BLACKLIST
deleted file mode 100644
index 12f45f0e12..0000000000
--- a/tests/auto/network/access/qabstractnetworkcache/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-[cacheControl]
-windows-10 msvc-2015
diff --git a/tests/auto/network/access/qftp/BLACKLIST b/tests/auto/network/access/qftp/BLACKLIST
index 463030a089..0a99f3eb00 100644
--- a/tests/auto/network/access/qftp/BLACKLIST
+++ b/tests/auto/network/access/qftp/BLACKLIST
@@ -7,15 +7,10 @@ redhatenterpriselinuxworkstation-6.6
 redhatenterpriselinuxworkstation-6.6
 
 [list]
-ubuntu-16.04
 opensuse-leap
-osx-10.11
 windows-7sp1
-ubuntu-18.04
-osx-10.14
-b2qt
-osx-10.12
 windows-10 msvc-2015
-opensuse-42.3
+ubuntu
+osx
 [list:epsvNotSupported]
 *
diff --git a/tests/auto/network/access/qnetworkreply/BLACKLIST b/tests/auto/network/access/qnetworkreply/BLACKLIST
index f9bbdd96c3..2a0651f96f 100644
--- a/tests/auto/network/access/qnetworkreply/BLACKLIST
+++ b/tests/auto/network/access/qnetworkreply/BLACKLIST
@@ -1,106 +1,53 @@
 # See qtbase/src/testlib/qtestblacklist.cpp for format
 [authenticationCacheAfterCancel]
-windows-10 msvc-2017
-windows-10 msvc-2015
-osx-10.13
 windows-7sp1
-[httpAbort]
-ubuntu-16.04
-rhel-7.6
+windows-10 msvc-2015
 [backgroundRequestInterruption]
-ubuntu-16.04
 opensuse-leap
-ubuntu-18.04
-b2qt
-osx-10.12
 windows-10 msvc-2015
-opensuse-42.3
+b2qt
+ubuntu
+osx
 [backgroundRequestInterruption:ftp, bg, nobg]
 *
-[getErrors]
-osx-10.13
-# QTBUG-71953
 [getErrors:ftp-host]
 linux
 # QTBUG-71953
 [getFromHttp]
-rhel-6.6
-ubuntu-16.04
-rhel-7.6
-opensuse-leap
-osx-10.11
-osx-10.13
-windows-7sp1
-ubuntu-18.04
-osx-10.14
-rhel-7.4
-b2qt
-windows-10 msvc-2017
-osx-10.12
-windows-10 msvc-2015
-opensuse-42.3
+* !android !winrt
 [getFromHttp:success-external]
 *
 [getFromHttpIntoBuffer]
-osx-10.12
-osx-10.13
+osx
 [getFromHttpIntoBuffer2]
-windows-10 msvc-2015
-windows-10 msvc-2017
+windows-10
 [headFromHttp]
-osx-10.13
 windows-10 msvc-2017
-[ioGetFromHttpWithSocksProxy]
-osx-10.12
 [ioPostToHttpFromSocket]
 # QTBUG-66247
-osx-10.13
 windows-7sp1
 windows-10 msvc-2017
-osx-10.12
-windows-10 msvc-2015
+osx
 [ioHttpRedirect]
-windows-10 msvc-2015
 # QTBUG-66602
-windows-10 msvc-2017
+windows-10
 [ioHttpRedirectMultipartPost]
-ubuntu-16.04
-rhel-7.6
 # QTBUG-66247
-opensuse-leap
-osx-10.13
-ubuntu-18.04
-rhel-7.4
 b2qt
-osx-10.12
 windows-10 msvc-2015
-opensuse-42.3
+ubuntu
+rhel
 [ioHttpRedirectPolicy]
-ubuntu-16.04
 opensuse-leap
-windows-7sp1
-ubuntu-18.04
 b2qt
-windows-10 msvc-2017
-windows-10 msvc-2015
-opensuse-42.3
-[ioHttpRedirectPostPut]
-osx-10.12
-windows-10 msvc-2015
+ubuntu
+windows-10
 [putToFtp]
-windows-10 msvc-2017
+windows-10
 [putWithServerClosingConnectionImmediately]
-osx-10.11
-osx-10.13
-windows-7sp1
-windows-10 msvc-2017
-osx-10.12
-windows-10 msvc-2015
-[qtbug28035browserDoesNotLoadQtProjectOrgCorrectly]
-windows-10 msvc-2015
 windows-7sp1
-[authenticationWithDifferentRealm]
-osx-10.13
+windows-10
+osx
 [backgroundRequest]
 osx-10.12
 [connectToIPv6Address]
@@ -109,141 +56,73 @@ osx-10.12
 osx-10.12
 [downloadProgress]
 osx-10.12
-[emitErrorForAllReplies]
-osx-10.12
 [encrypted]
 osx-10.13
-[ftpAuthentication]
-osx-10.13
 [httpCanReadLine]
 osx-10.12
-osx-10.13
 [httpRecursiveCreation]
-osx-10.12
-osx-10.13
+osx
 [httpWithNoCredentialUsage]
 osx-10.12
 [ignoreSslErrorsList]
-osx-10.12
-osx-10.13
+osx
 [ignoreSslErrorsListWithSlot]
-osx-10.12
-osx-10.13
+osx
 [ioGetFromBuiltinHttp]
-osx-10.12
-osx-10.11
-osx-10.14
-osx-10.13
+osx
 [ioGetFromHttp]
 osx-10.12
-[ioGetFromHttpWithAuth]
-osx-10.12
-osx-10.13
-[ioGetFromHttpWithAuthSynchronous]
-osx-10.12
-[ioGetFromHttpWithProxyAuth]
-osx-10.12
-[ioGetFromHttpWithReuseParallel]
-osx-10.12
-osx-10.13
-[ioGetFromHttpWithReuseSequential]
-osx-10.12
-osx-10.13
-[ioGetFromHttpsWithIgnoreSslErrors]
-osx-10.12
-[ioGetFromHttpsWithSslErrors]
-osx-10.12
-[ioGetFromHttpsWithSslHandshakeError]
-osx-10.12
-[ioGetWithManyProxies]
-osx-10.12
 [ioPostToHttpFromFile]
 osx-10.13
-[ioPostToHttpFromMiddleOfFileFiveBytes]
-osx-10.13
-[ioPostToHttpFromMiddleOfFileToEnd]
-osx-10.13
-[ioPostToHttpFromMiddleOfQBufferFiveBytes]
-osx-10.13
 [ioPostToHttpFromSocketSynchronous]
-osx-10.12
-osx-10.13
-[ioPostToHttpNoBufferFlag]
-osx-10.13
+osx
 [ioPostToHttpUploadProgress]
-osx-10.12
-osx-10.11
-osx-10.13
+osx
 [ioPutToHttpFromFile]
 osx-10.13
 [lastModifiedHeaderForHttp]
 osx-10.12
-osx-10.13
 [multipartSkipIndices]
 osx-10.12
-osx-10.13
 [nestedEventLoops]
-osx-10.12
-osx-10.13
-[pipelining]
-osx-10.13
+osx
 [postToHttp]
 osx-10.12
-osx-10.13
 [postToHttpMultipart]
 osx-10.12
-osx-10.13
 [postToHttpSynchronous]
 osx-10.12
-osx-10.13
 [postToHttps]
-osx-10.12
-osx-10.13
+osx
 [postToHttpsMultipart]
-osx-10.12
-osx-10.13
+osx
 [postToHttpsSynchronous]
-osx-10.12
-osx-10.13
+osx
 [putGetDeleteGetFromHttp]
 osx-10.12
-[putToHttp]
-osx-10.12
-osx-10.13
 [putToHttpSynchronous]
 osx-10.12
-osx-10.13
 [putToHttps]
-osx-10.12
-osx-10.13
+osx
 [putToHttpsSynchronous]
-osx-10.12
-osx-10.13
+osx
 [putWithRateLimiting]
-osx-10.12
 osx-10.13
 [qtbug13431replyThrottling]
 osx-10.12
 [receiveCookiesFromHttp]
-osx-10.12
-osx-10.13
+osx
 [receiveCookiesFromHttpSynchronous]
-osx-10.12
-osx-10.13
+osx
 [sendCookies]
-osx-10.12
-osx-10.13
+osx
 [sendCookiesSynchronous]
-osx-10.12
-osx-10.13
+osx
 [sendCustomRequestToHttp]
 osx-10.12
 [sslConfiguration]
-osx-10.12
-osx-10.13
+osx
 [synchronousRequest]
-osx-10.12
-osx-10.13
+osx
 [backgroundRequestConnectInBackground]
-osx-10.12
-osx-10.13
+osx
diff --git a/tests/auto/network/access/spdy/BLACKLIST b/tests/auto/network/access/spdy/BLACKLIST
index ce2f7f383f..5cf79327be 100644
--- a/tests/auto/network/access/spdy/BLACKLIST
+++ b/tests/auto/network/access/spdy/BLACKLIST
@@ -1,8 +1,5 @@
 [download]
 opensuse-leap
-ubuntu-18.04
-ubuntu-16.04
-b2qt
 [upload]
 opensuse-leap
 ubuntu-18.04
diff --git a/tests/auto/network/kernel/qdnslookup/BLACKLIST b/tests/auto/network/kernel/qdnslookup/BLACKLIST
index 4461d8b5f7..f07a8ce9a3 100644
--- a/tests/auto/network/kernel/qdnslookup/BLACKLIST
+++ b/tests/auto/network/kernel/qdnslookup/BLACKLIST
@@ -1,12 +1,2 @@
 [lookup]
-rhel-7.6
-opensuse-leap
-osx-10.13
-windows-7sp1
-ubuntu-18.04
-rhel-7.4
-b2qt
-windows-10 msvc-2017
-osx-10.12
-windows-10 msvc-2015
-opensuse-42.3
+*
diff --git a/tests/auto/network/socket/qsocks5socketengine/BLACKLIST b/tests/auto/network/socket/qsocks5socketengine/BLACKLIST
index f769aafbdd..61fff6ee00 100644
--- a/tests/auto/network/socket/qsocks5socketengine/BLACKLIST
+++ b/tests/auto/network/socket/qsocks5socketengine/BLACKLIST
@@ -4,8 +4,7 @@
 ubuntu-18.04
 # QTBUG-74162
 [passwordAuth2]
-osx-10.12
-ubuntu-18.04
+ubuntu
 [downloadBigFile]
 windows-10 msvc-2015
 windows-7sp1
diff --git a/tests/auto/network/socket/qtcpserver/BLACKLIST b/tests/auto/network/socket/qtcpserver/BLACKLIST
index ad0edf0af1..e268468bdb 100644
--- a/tests/auto/network/socket/qtcpserver/BLACKLIST
+++ b/tests/auto/network/socket/qtcpserver/BLACKLIST
@@ -1,24 +1,16 @@
-[listenWhileListening]
-windows-10 msvc-2015
 [listenWhileListening:WithSocks5Proxy]
 linux
 windows
 [ipv6Server]
-windows-10 msvc-2015
 windows-7sp1
 windows-10 msvc-2017
 [ipv6Server:WithoutProxy]
 windows
 osx
-[addressReusable]
-windows-10 msvc-2015
 [eagainBlockingAccept]
-windows-10 msvc-2015
-windows-7sp1
-windows-10 msvc-2017
-[proxyFactory]
 windows-7sp1
+windows-10
 [serverAddress]
-windows-10 msvc-2017
-windows-10 msvc-2015
 windows-7sp1
+windows-10
+
diff --git a/tests/auto/network/socket/qtcpsocket/BLACKLIST b/tests/auto/network/socket/qtcpsocket/BLACKLIST
index 8c2f8d2638..07532710b3 100644
--- a/tests/auto/network/socket/qtcpsocket/BLACKLIST
+++ b/tests/auto/network/socket/qtcpsocket/BLACKLIST
@@ -5,9 +5,6 @@ windows-7sp1
 windows
 [bind:[::]:randomport]
 windows
-[timeoutConnect]
-windows-10 msvc-2015
-# QTBUG-66247
 [timeoutConnect:ip]
 windows
 # QTBUG-66247
diff --git a/tests/auto/network/socket/qudpsocket/BLACKLIST b/tests/auto/network/socket/qudpsocket/BLACKLIST
index 9b5aa8a3fc..bc6068d695 100644
--- a/tests/auto/network/socket/qudpsocket/BLACKLIST
+++ b/tests/auto/network/socket/qudpsocket/BLACKLIST
@@ -2,15 +2,9 @@
 windows-10 msvc-2017
 windows-10 msvc-2015
 windows-7sp1
-[multicastLeaveAfterClose]
-osx-10.12
-osx-10.11
 [readyReadForEmptyDatagram]
 opensuse-leap
-ubuntu-16.04
 [echo]
 opensuse-42.3
-[ipv6Loop]
-osx-10.12
 [readyReadForEmptyDatagram]
 linux
diff --git a/tests/auto/network/ssl/qsslkey/BLACKLIST b/tests/auto/network/ssl/qsslkey/BLACKLIST
index e9723001f5..19fb15cd1f 100644
--- a/tests/auto/network/ssl/qsslkey/BLACKLIST
+++ b/tests/auto/network/ssl/qsslkey/BLACKLIST
@@ -1,16 +1,9 @@
 [constructor]
-rhel-6.6
-rhel-7.4
-rhel-7.6
+rhel
 [length]
-rhel-6.6
-rhel-7.4
-rhel-7.6
+rhel
 [toEncryptedPemOrDer]
-rhel-6.6
-rhel-7.4
-rhel-7.6
+rhel
 [toPemOrDer]
-rhel-6.6
-rhel-7.4
-rhel-7.6
+rhel
+
diff --git a/tests/auto/network/ssl/qsslsocket/BLACKLIST b/tests/auto/network/ssl/qsslsocket/BLACKLIST
index 36143691c9..7b4a29f463 100644
--- a/tests/auto/network/ssl/qsslsocket/BLACKLIST
+++ b/tests/auto/network/ssl/qsslsocket/BLACKLIST
@@ -1,11 +1,7 @@
-[abortOnSslErrors]
-windows-10 msvc-2015
 [deprecatedProtocols]
 windows
 [spontaneousWrite]
 windows-7sp1
-[sslErrors]
-windows-7sp1
 [connectToHostEncrypted]
 osx-10.13
 [setSslConfiguration]
diff --git a/tests/auto/other/networkselftest/BLACKLIST b/tests/auto/other/networkselftest/BLACKLIST
index 948081eb78..55ebad985d 100644
--- a/tests/auto/other/networkselftest/BLACKLIST
+++ b/tests/auto/other/networkselftest/BLACKLIST
@@ -1,6 +1,5 @@
 # QTBUG-27571
 [ftpProxyServer]
-windows-10 msvc-2017
-windows-10 msvc-2015
 windows-7sp1
+windows-10
 
diff --git a/tests/auto/other/qfocusevent/BLACKLIST b/tests/auto/other/qfocusevent/BLACKLIST
deleted file mode 100644
index 5af8be91a0..0000000000
--- a/tests/auto/other/qfocusevent/BLACKLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-[checkReason_ActiveWindow]
-winrt
-
diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/BLACKLIST b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/BLACKLIST
index 65a939cdcb..6173488c00 100644
--- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/BLACKLIST
+++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/BLACKLIST
@@ -1,5 +1,4 @@
 [downloadCheck]
-windows-10 msvc-2015
-windows-10 msvc-2017
+windows-10
 [downloadCheck:with-zeroCopy]
 windows
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST b/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST
index f2f0f8d26e..aae2cacc3b 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/BLACKLIST
@@ -7,13 +7,10 @@ b2qt
 [specialFiles]
 b2qt
 [dirsBeforeFiles]
-ubuntu-16.04
-rhel-7.6
-windows-10 msvc-2017
-ubuntu-18.04
-b2qt
 winrt
-windows-10 msvc-2015
-
+b2qt
+ubuntu
+windows-10
+rhel
 [drives]
 winrt
diff --git a/tests/auto/widgets/dialogs/qmessagebox/BLACKLIST b/tests/auto/widgets/dialogs/qmessagebox/BLACKLIST
index e633e7c0a3..8d8a7c2105 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/BLACKLIST
+++ b/tests/auto/widgets/dialogs/qmessagebox/BLACKLIST
@@ -1,6 +1,4 @@
 [defaultButton]
-ubuntu-16.04
-rhel-7.6
 opensuse-leap
-ubuntu-18.04
-rhel-7.4
+rhel-7.6
+ubuntu
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST
index a3c9e2e421..c3797c9d57 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/BLACKLIST
@@ -1,7 +1,5 @@
 [isActive]
 opensuse-42.3 ci
-[removeFullyTransparentItem]
-osx-10.12
 [tabFocus_sceneWithNestedFocusWidgets]
 opensuse-42.3
 
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
index 22fce8620b..9b76ea02ff 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/BLACKLIST
@@ -1,24 +1,16 @@
 [task255529_transformationAnchorMouseAndViewportMargins]
 opensuse-leap
-rhel-7.4
-ubuntu-16.04
-opensuse-42.3
 [cursor]
 opensuse-leap
-ubuntu-16.04
-opensuse-42.3
 [cursor2]
 ubuntu-16.04
 [sendEvent]
 ubuntu-16.04
 opensuse-42.3
 [resizeAnchor]
-ubuntu-16.04
-rhel-7.6
 opensuse-leap
-ubuntu-18.04
-rhel-7.4
-opensuse-42.3
+rhel-7.6
+ubuntu
 [update2]
 opensuse-42.3
 [itemsInRect_cosmeticAdjust]
diff --git a/tests/auto/widgets/itemviews/qheaderview/BLACKLIST b/tests/auto/widgets/itemviews/qheaderview/BLACKLIST
index 297a6fe7b7..4eceaae0d3 100644
--- a/tests/auto/widgets/itemviews/qheaderview/BLACKLIST
+++ b/tests/auto/widgets/itemviews/qheaderview/BLACKLIST
@@ -1,3 +1,2 @@
 [stretchAndRestoreLastSection]
 opensuse-leap
-opensuse-42.3
diff --git a/tests/auto/widgets/kernel/qapplication/BLACKLIST b/tests/auto/widgets/kernel/qapplication/BLACKLIST
index ac65a97c40..c68c7d6b14 100644
--- a/tests/auto/widgets/kernel/qapplication/BLACKLIST
+++ b/tests/auto/widgets/kernel/qapplication/BLACKLIST
@@ -1,4 +1,3 @@
 [touchEventPropagation]
-opensuse-leap
 # QTBUG-66745
-opensuse-42.3
+opensuse-leap
diff --git a/tests/auto/widgets/kernel/qwidget/BLACKLIST b/tests/auto/widgets/kernel/qwidget/BLACKLIST
index 02e97e4b4e..26f9ce1b85 100644
--- a/tests/auto/widgets/kernel/qwidget/BLACKLIST
+++ b/tests/auto/widgets/kernel/qwidget/BLACKLIST
@@ -14,12 +14,9 @@ rhel-7.4
 ubuntu-16.04
 rhel-7.6
 [focusProxyAndInputMethods]
-ubuntu-16.04
 rhel-7.6
 opensuse-leap
-ubuntu-18.04
-rhel-7.4
-opensuse-42.3
+ubuntu
 [raise]
 opensuse-leap
 # QTBUG-68175
@@ -45,12 +42,9 @@ opensuse-leap
 [moveInResizeEvent]
 ubuntu-16.04
 [multipleToplevelFocusCheck]
-ubuntu-16.04
 rhel-7.6
 opensuse-leap
-ubuntu-18.04
-rhel-7.4
-opensuse-42.3
+ubuntu
 [windowState]
 # QTBUG-75270
 winrt