6 files changed, 18 insertions, 11 deletions
diff --git a/tests/auto/other/macgui/BLACKLIST b/tests/auto/other/macgui/BLACKLIST
index 2b6a0e2fe8..5a5d6a175f 100644
--- a/tests/auto/other/macgui/BLACKLIST
+++ b/tests/auto/other/macgui/BLACKLIST
@@ -1,3 +1,2 @@
 [nonModalOrder]
-osx-10.11 ci
-osx-10.12 ci
+osx
diff --git a/tests/auto/other/macgui/tst_macgui.cpp b/tests/auto/other/macgui/tst_macgui.cpp
index c6fc67f998..75fa4815c9 100644
--- a/tests/auto/other/macgui/tst_macgui.cpp
+++ b/tests/auto/other/macgui/tst_macgui.cpp
@@ -190,7 +190,6 @@ void tst_MacGui::nonModalOrder()
     primary.resize(400, 400);
     primary.move(100, 100);
     primary.exec();
-    QEXPECT_FAIL("", "Non-modal child windows show behind the modal dialig", Abort);
     QCOMPARE(primary.frontWidget, primary.secondaryWindow);
 }
 
diff --git a/tests/auto/other/macnativeevents/BLACKLIST b/tests/auto/other/macnativeevents/BLACKLIST
index 5be479a6b1..674e62144a 100644
--- a/tests/auto/other/macnativeevents/BLACKLIST
+++ b/tests/auto/other/macnativeevents/BLACKLIST
@@ -21,10 +21,6 @@ osx
 osx
 [testMouseDragToNonClientArea]
 osx
-# QTQAINFRA-1292
-[testPushButtonPressRelease]
-osx-10.11 ci
-
 # The following key tests fail after switching to synchronous
 # expose events, and we don't know why yet. QTBUG-62042
 [testKeyPressOnToplevel]
@@ -35,3 +31,9 @@ osx
 osx
 [testModifierCtrl]
 osx
+# QTQAINFRA-1292
+[testPushButtonPressRelease]
+osx-10.11 ci
+# QTQAINFRA-1292
+[testModifierCtrlWithDontSwapCtrlAndMeta]
+osx-10.12 ci
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 4f60fe3d96..4ffdc4c762 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -3344,7 +3344,7 @@ void tst_QAccessibility::tableTest()
 
 void tst_QAccessibility::calendarWidgetTest()
 {
-#ifndef QT_NO_CALENDARWIDGET
+#if QT_CONFIG(calendarwidget)
     {
     QCalendarWidget calendarWidget;
 
@@ -3420,12 +3420,12 @@ void tst_QAccessibility::calendarWidgetTest()
 
     }
     QTestAccessibility::clearEvents();
-#endif // QT_NO_CALENDARWIDGET
+#endif // QT_CONFIG(calendarwidget)
 }
 
 void tst_QAccessibility::dockWidgetTest()
 {
-#ifndef QT_NO_DOCKWIDGET
+#if QT_CONFIG(dockwidget)
     // Set up a proper main window with two dock widgets
     QMainWindow *mw = new QMainWindow();
     QFrame *central = new QFrame(mw);
@@ -3558,7 +3558,7 @@ void tst_QAccessibility::dockWidgetTest()
 
     delete mw;
     QTestAccessibility::clearEvents();
-#endif // QT_NO_DOCKWIDGET
+#endif // QT_CONFIG(dockwidget)
 }
 
 void tst_QAccessibility::comboBoxTest()
diff --git a/tests/auto/other/qaccessibilitymac/BLACKLIST b/tests/auto/other/qaccessibilitymac/BLACKLIST
new file mode 100644
index 0000000000..f53fa7e853
--- /dev/null
+++ b/tests/auto/other/qaccessibilitymac/BLACKLIST
@@ -0,0 +1,2 @@
+[hierarchyTest]
+osx-10.12 ci
diff --git a/tests/auto/other/qfocusevent/BLACKLIST b/tests/auto/other/qfocusevent/BLACKLIST
new file mode 100644
index 0000000000..502820fa12
--- /dev/null
+++ b/tests/auto/other/qfocusevent/BLACKLIST
@@ -0,0 +1,5 @@
+[checkReason_Shortcut]
+osx-10.12 ci
+[checkReason_ActiveWindow]
+osx-10.12 ci
+