3 files changed, 15 insertions, 21 deletions
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/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 63f6e67a3e..243cb6483e 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -417,20 +417,19 @@ void tst_QWizard::setPixmap()
     QVERIFY(wizard.pixmap(QWizard::BannerPixmap).isNull());
     QVERIFY(wizard.pixmap(QWizard::LogoPixmap).isNull());
     QVERIFY(wizard.pixmap(QWizard::WatermarkPixmap).isNull());
-#ifdef Q_OS_OSX
-    QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
-#else
-    QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull());
-#endif
+    if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::MacOSHighSierra)
+        QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
+    else
+        QVERIFY(wizard.pixmap(QWizard::BackgroundPixmap).isNull());
 
     QVERIFY(page->pixmap(QWizard::BannerPixmap).isNull());
     QVERIFY(page->pixmap(QWizard::LogoPixmap).isNull());
     QVERIFY(page->pixmap(QWizard::WatermarkPixmap).isNull());
-#ifdef Q_OS_OSX
-    QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
-#else
-    QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull());
-#endif
+    if (QOperatingSystemVersion::current() <= QOperatingSystemVersion::MacOSHighSierra)
+        QVERIFY(!wizard.pixmap(QWizard::BackgroundPixmap).isNull());
+    else
+        QVERIFY(page->pixmap(QWizard::BackgroundPixmap).isNull());
+
     wizard.setPixmap(QWizard::BannerPixmap, p1);
     wizard.setPixmap(QWizard::LogoPixmap, p2);
     wizard.setPixmap(QWizard::WatermarkPixmap, p3);