15 files changed, 47 insertions, 61 deletions
diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/BLACKLIST b/tests/auto/corelib/animation/qsequentialanimationgroup/BLACKLIST
index e516c0e826..f07c0ec4a1 100644
--- a/tests/auto/corelib/animation/qsequentialanimationgroup/BLACKLIST
+++ b/tests/auto/corelib/animation/qsequentialanimationgroup/BLACKLIST
@@ -1,6 +1,6 @@
 [finishWithUncontrolledAnimation]
 windows-10 msvc-2015
-osx-10.13
+macos
 [groupWithZeroDurationAnimations]
-osx-10.13
+macos
 
diff --git a/tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST b/tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST
index 569880e1db..2317cf886c 100644
--- a/tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST
+++ b/tests/auto/corelib/kernel/qelapsedtimer/BLACKLIST
@@ -1,3 +1,3 @@
 [elapsed]
-osx-10.13
+macos
 windows-10
diff --git a/tests/auto/corelib/thread/qsemaphore/BLACKLIST b/tests/auto/corelib/thread/qsemaphore/BLACKLIST
index d7af5c420b..f7f6d5149c 100644
--- a/tests/auto/corelib/thread/qsemaphore/BLACKLIST
+++ b/tests/auto/corelib/thread/qsemaphore/BLACKLIST
@@ -2,9 +2,7 @@
 osx
 [tryAcquireWithTimeout:0.2s]
 windows
-osx-10.12
-osx-10.13
+macos
 [tryAcquireWithTimeout:2s]
 windows
-osx-10.12
-osx-10.13
+macos
diff --git a/tests/auto/corelib/tools/qtimeline/BLACKLIST b/tests/auto/corelib/tools/qtimeline/BLACKLIST
index 9794b0059f..961147a3cf 100644
--- a/tests/auto/corelib/tools/qtimeline/BLACKLIST
+++ b/tests/auto/corelib/tools/qtimeline/BLACKLIST
@@ -2,6 +2,5 @@
 windows-10 msvc-2015
 osx
 [frameRate]
-osx-10.12
-osx-10.13
+macos
 
diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST
index 27463adf99..44a55316ab 100644
--- a/tests/auto/gui/kernel/qwindow/BLACKLIST
+++ b/tests/auto/gui/kernel/qwindow/BLACKLIST
@@ -2,10 +2,10 @@
 opensuse-leap
 [positioning:default]
 linux
-osx-10.12 ci
+macos ci
 winrt
 [positioning:fake]
-osx-10.12 ci
+macos ci
 [modalWithChildWindow]
 # QTBUG-66851
 # QTBUG-69160
diff --git a/tests/auto/network/access/qnetworkreply/BLACKLIST b/tests/auto/network/access/qnetworkreply/BLACKLIST
index 2a0651f96f..801ac65d71 100644
--- a/tests/auto/network/access/qnetworkreply/BLACKLIST
+++ b/tests/auto/network/access/qnetworkreply/BLACKLIST
@@ -49,21 +49,21 @@ windows-7sp1
 windows-10
 osx
 [backgroundRequest]
-osx-10.12
+macos
 [connectToIPv6Address]
-osx-10.12
+macos
 [deleteFromHttp]
-osx-10.12
+macos
 [downloadProgress]
-osx-10.12
+macos
 [encrypted]
-osx-10.13
+macos
 [httpCanReadLine]
-osx-10.12
+macos
 [httpRecursiveCreation]
 osx
 [httpWithNoCredentialUsage]
-osx-10.12
+macos
 [ignoreSslErrorsList]
 osx
 [ignoreSslErrorsListWithSlot]
@@ -71,27 +71,27 @@ osx
 [ioGetFromBuiltinHttp]
 osx
 [ioGetFromHttp]
-osx-10.12
+macos
 [ioPostToHttpFromFile]
-osx-10.13
+macos
 [ioPostToHttpFromSocketSynchronous]
 osx
 [ioPostToHttpUploadProgress]
 osx
 [ioPutToHttpFromFile]
-osx-10.13
+macos
 [lastModifiedHeaderForHttp]
-osx-10.12
+macos
 [multipartSkipIndices]
-osx-10.12
+macos
 [nestedEventLoops]
 osx
 [postToHttp]
-osx-10.12
+macos
 [postToHttpMultipart]
-osx-10.12
+macos
 [postToHttpSynchronous]
-osx-10.12
+macos
 [postToHttps]
 osx
 [postToHttpsMultipart]
@@ -99,17 +99,17 @@ osx
 [postToHttpsSynchronous]
 osx
 [putGetDeleteGetFromHttp]
-osx-10.12
+macos
 [putToHttpSynchronous]
-osx-10.12
+macos
 [putToHttps]
 osx
 [putToHttpsSynchronous]
 osx
 [putWithRateLimiting]
-osx-10.13
+macos
 [qtbug13431replyThrottling]
-osx-10.12
+macos
 [receiveCookiesFromHttp]
 osx
 [receiveCookiesFromHttpSynchronous]
@@ -119,7 +119,7 @@ osx
 [sendCookiesSynchronous]
 osx
 [sendCustomRequestToHttp]
-osx-10.12
+macos
 [sslConfiguration]
 osx
 [synchronousRequest]
diff --git a/tests/auto/network/ssl/qsslsocket/BLACKLIST b/tests/auto/network/ssl/qsslsocket/BLACKLIST
index 7b4a29f463..749c59d968 100644
--- a/tests/auto/network/ssl/qsslsocket/BLACKLIST
+++ b/tests/auto/network/ssl/qsslsocket/BLACKLIST
@@ -3,9 +3,9 @@ windows
 [spontaneousWrite]
 windows-7sp1
 [connectToHostEncrypted]
-osx-10.13
+macos
 [setSslConfiguration]
 windows-10 msvc-2015
 windows-7sp1
 [connectToHostEncryptedWithVerificationPeerName]
-osx-10.13
+macos
diff --git a/tests/auto/other/macnativeevents/BLACKLIST b/tests/auto/other/macnativeevents/BLACKLIST
index 2922e22d9f..b0a6551587 100644
--- a/tests/auto/other/macnativeevents/BLACKLIST
+++ b/tests/auto/other/macnativeevents/BLACKLIST
@@ -19,7 +19,7 @@ osx
 osx
 [testMouseDragToNonClientArea]
 osx
-osx-10.12 ci
+macos ci
 # The following key tests fail after switching to synchronous
 # expose events, and we don't know why yet. QTBUG-62042
 [testKeyPressOnToplevel]
@@ -32,8 +32,8 @@ osx
 osx
 # QTQAINFRA-1292
 [testPushButtonPressRelease]
-osx-10.12 ci
+macos ci
 
 # QTQAINFRA-1292
 [testModifierCtrlWithDontSwapCtrlAndMeta]
-osx-10.12 ci
+macos ci
diff --git a/tests/auto/widgets/dialogs/qdialog/BLACKLIST b/tests/auto/widgets/dialogs/qdialog/BLACKLIST
index 72e3dff6dd..ad86386895 100644
--- a/tests/auto/widgets/dialogs/qdialog/BLACKLIST
+++ b/tests/auto/widgets/dialogs/qdialog/BLACKLIST
@@ -1,4 +1,4 @@
 [snapToDefaultButton]
-osx-10.14
+macos
 [showFullScreen]
-osx-10.13 ci
+macos ci
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST b/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST
index 875855b59e..9e14db48d0 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST
+++ b/tests/auto/widgets/dialogs/qfiledialog2/BLACKLIST
@@ -1,4 +1,2 @@
 [QTBUG4419_lineEditSelectAll]
-osx-10.12
-osx-10.14
-osx-10.13
+macos
diff --git a/tests/auto/widgets/kernel/qwidget/BLACKLIST b/tests/auto/widgets/kernel/qwidget/BLACKLIST
index be19d8fd0b..cf35491ec0 100644
--- a/tests/auto/widgets/kernel/qwidget/BLACKLIST
+++ b/tests/auto/widgets/kernel/qwidget/BLACKLIST
@@ -24,9 +24,7 @@ opensuse-42.3
 [childEvents]
 macos
 [renderInvisible]
-osx-10.12
-osx-10.11
-osx-10.14
+macos
 [optimizedResizeMove]
 osx
 [optimizedResize_topLevel]
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST b/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST
index 8f5648d0f9..9da179e365 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST
+++ b/tests/auto/widgets/widgets/qdoublespinbox/BLACKLIST
@@ -1,4 +1,2 @@
 [editingFinished]
-osx-10.12
-osx-10.14
-osx-10.13
+macos
diff --git a/tests/auto/widgets/widgets/qmdiarea/BLACKLIST b/tests/auto/widgets/widgets/qmdiarea/BLACKLIST
index 1dd876ea97..6010772be7 100644
--- a/tests/auto/widgets/widgets/qmdiarea/BLACKLIST
+++ b/tests/auto/widgets/widgets/qmdiarea/BLACKLIST
@@ -2,15 +2,12 @@
 ubuntu-16.04
 rhel-7.6
 opensuse-leap
-osx-10.11
-osx-10.13
+macos
 ubuntu-18.04
-osx-10.14
+macos
 rhel-7.4
-osx-10.12
+macos
 opensuse-42.3
 [resizeTimer]
-osx-10.12
-osx-10.14
-osx-10.13
+macos
 
diff --git a/tests/auto/widgets/widgets/qmenu/BLACKLIST b/tests/auto/widgets/widgets/qmenu/BLACKLIST
index ba9c184a67..5677172f8e 100644
--- a/tests/auto/widgets/widgets/qmenu/BLACKLIST
+++ b/tests/auto/widgets/widgets/qmenu/BLACKLIST
@@ -1,14 +1,12 @@
 [task258920_mouseBorder]
-osx-10.14
-osx-10.13
+macos
 [layoutDirection]
-osx-10.12
-osx-10.13
+macos
 # Fails when enabling synchronous expose events QTBUG-62092
 [pushButtonPopulateOnAboutToShow]
-osx-10.13
+macos
 [tearOff]
-osx-10.14
+macos
 [activeSubMenuPosition]
 winrt
 [submenuTearOffDontClose]
diff --git a/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST b/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST
index 52ba36562f..315e179d0a 100644
--- a/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST
+++ b/tests/auto/widgets/widgets/qtoolbutton/BLACKLIST
@@ -1,2 +1,2 @@
 [task176137_autoRepeatOfAction]
-osx-10.13
+macos