diff --git a/src/qgcunittest/MessageBoxTest.cc b/src/qgcunittest/MessageBoxTest.cc
index 79329edf0c713c88cc14e17c2539462f9602aaa2..72cf44bfc58fc55d7ecea199bddd040b7591ca78 100644
--- a/src/qgcunittest/MessageBoxTest.cc
+++ b/src/qgcunittest/MessageBoxTest.cc
@@ -31,21 +31,11 @@
 
 UT_REGISTER_TEST(MessageBoxTest)
 
-MessageBoxTest::MessageBoxTest(void) :
-    _expectMissedMessageBox(false)
+MessageBoxTest::MessageBoxTest(void)
 {
     
 }
 
-void MessageBoxTest::cleanup(void)
-{
-    if (_expectMissedMessageBox) {
-        _expectMissedMessageBox = false;
-        QEXPECT_FAIL("", "Supposed to fail in cleanup with a missed message box", Continue);
-    }
-    UnitTest::cleanup();
-}
-
 void MessageBoxTest::_messageBoxExpected_test(void)
 {
     setExpectedMessageBox(QMessageBox::Ok);
@@ -57,7 +47,7 @@ void MessageBoxTest::_messageBoxExpected_test(void)
 
 void MessageBoxTest::_messageBoxUnexpected_test(void)
 {
-    // This should cause the test to fail in the cleanup method
+    // This should cause an expected failure in the cleanup method
     QGCMessageBox::information(QString(), QString());
     _expectMissedMessageBox = true;
 }
@@ -75,7 +65,7 @@ void MessageBoxTest::_previousMessageBox_test(void)
 void MessageBoxTest::_noMessageBox_test(void)
 {
     setExpectedMessageBox(QMessageBox::Ok);
-    checkExpectedMessageBox(expectFailNoMessageBox);
+    checkExpectedMessageBox(expectFailNoDialog);
 }
 
 void MessageBoxTest::_badResponseButton_test(void)
diff --git a/src/qgcunittest/MessageBoxTest.h b/src/qgcunittest/MessageBoxTest.h
index 388c4c0bb1d22a8bca5dd2d99d5d94e993aa068e..f831829e0b3af1b4a2147946fdf4c4e38dba9fc0 100644
--- a/src/qgcunittest/MessageBoxTest.h
+++ b/src/qgcunittest/MessageBoxTest.h
@@ -39,16 +39,11 @@ public:
     MessageBoxTest(void);
     
 private slots:
-    void cleanup(void);
-    
     void _messageBoxExpected_test(void);
     void _messageBoxUnexpected_test(void);
     void _previousMessageBox_test(void);
     void _noMessageBox_test(void);
     void _badResponseButton_test(void);
-    
-private:
-    bool _expectMissedMessageBox;
 };
 
 #endif
diff --git a/src/qgcunittest/PX4RCCalibrationTest.cc b/src/qgcunittest/PX4RCCalibrationTest.cc
index a1550bbc84ce63f4dfe02a1ebf8fc8bcfbfc63e1..f4e5ac35c7ed819248e8dfa992742800613544f2 100644
--- a/src/qgcunittest/PX4RCCalibrationTest.cc
+++ b/src/qgcunittest/PX4RCCalibrationTest.cc
@@ -139,8 +139,6 @@ PX4RCCalibrationTest::PX4RCCalibrationTest(void) :
 /// @brief Called one time before any test cases are run.
 void PX4RCCalibrationTest::initTestCase(void)
 {
-    UnitTest::initTestCase();
-    
 	// Validate that our function to channel mapping is still correct.
 	for (int function=0; function<PX4RCCalibration::rcCalFunctionMax; function++) {
 		int chanIndex = _rgFunctionChannelMap[function];
diff --git a/src/qgcunittest/QGCUASFileManagerTest.cc b/src/qgcunittest/QGCUASFileManagerTest.cc
index 47668c64f2d146a9f18d3723ca5f7b243a0434b9..0d55b3c1a367c8d8d45e29bb6ea54cb64c591164 100644
--- a/src/qgcunittest/QGCUASFileManagerTest.cc
+++ b/src/qgcunittest/QGCUASFileManagerTest.cc
@@ -42,8 +42,6 @@ QGCUASFileManagerUnitTest::QGCUASFileManagerUnitTest(void) :
 // Called once before all test cases are run
 void QGCUASFileManagerUnitTest::initTestCase(void)
 {
-    UnitTest::initTestCase();
-
     _mockUAS.setMockSystemId(_systemIdServer);
     _mockUAS.setMockMavlinkPlugin(&_mockFileServer);
 }