diff --git a/.travis.yml b/.travis.yml
index 16f60e65da8aaa8c4063ff373065e05c80c83b0f..33e715444df0ad71145d6162b5eaeae0f483b78f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
           sudo: false
         - os: osx
           osx_image: xcode7
-          env: SPEC=macx-clang CONFIG=debug
+          env: SPEC=macx-clang CONFIG=debug QT_FATAL_WARNINGS=1
         - os: osx
           osx_image: xcode7
           env: SPEC=macx-clang CONFIG=installer
diff --git a/src/VehicleSetup/SetupViewTest.cc b/src/VehicleSetup/SetupViewTest.cc
index 11d29ba9efd2e02205160063adcb47c960a88816..3ab4c6f654ef9af6f89a0435a11cfa5736cb6a1b 100644
--- a/src/VehicleSetup/SetupViewTest.cc
+++ b/src/VehicleSetup/SetupViewTest.cc
@@ -63,10 +63,6 @@ void SetupViewTest::_clickThrough_test(void)
         QTest::qWait(1000);
     }
 
-    // On MainWindow close we should get a message box telling the user to disconnect first.
-    
-    setExpectedMessageBox(QGCMessageBox::Yes);
-    
+    _disconnectMockLink();
     _closeMainWindow();
-    checkExpectedMessageBox();
 }
diff --git a/src/qgcunittest/UnitTest.cc b/src/qgcunittest/UnitTest.cc
index eb93e7e7b32de1bf996bd6df57c73efae8ac66e7..b3f5b404c4cd9846ae96212c8eee14a9f04afd60 100644
--- a/src/qgcunittest/UnitTest.cc
+++ b/src/qgcunittest/UnitTest.cc
@@ -417,5 +417,9 @@ void UnitTest::_closeMainWindow(bool cancelExpected)
 
         mainWindowSpy.wait(2000);
         QCOMPARE(mainWindowSpy.count(), cancelExpected ? 0 : 1);
+
+        // This leaves enough time for any dangling Qml components to get cleaned up.
+        // This prevents qWarning from bad references in Qml
+        QTest::qWait(1000);
     }
 }