diff --git a/src/MissionManager/MissionManagerTest.cc b/src/MissionManager/MissionManagerTest.cc
index 1f2d9937bccaf814d88d06b10ea65c7f4bc844f8..ad7045e5a86f7ccaad0cce51b72ddedacd794faf 100644
--- a/src/MissionManager/MissionManagerTest.cc
+++ b/src/MissionManager/MissionManagerTest.cc
@@ -25,7 +25,8 @@
 #include "LinkManager.h"
 #include "MultiVehicleManager.h"
 
-UT_REGISTER_TEST(MissionManagerTest)
+// FIXME: Temporarily disabled until this can be stabilized
+//UT_REGISTER_TEST(MissionManagerTest)
 
 const MissionManagerTest::TestCase_t MissionManagerTest::_rgTestCases[] = {
     { "0\t0\t3\t16\t10\t20\t30\t40\t-10\t-20\t-30\t1\r\n",  { 0, QGeoCoordinate(-10.0, -20.0, -30.0), MAV_CMD_NAV_WAYPOINT,     10.0, 20.0, 30.0, 40.0, true, false, MAV_FRAME_GLOBAL_RELATIVE_ALT } },
diff --git a/src/qgcunittest/MavlinkLogTest.cc b/src/qgcunittest/MavlinkLogTest.cc
index 44b1c39bcc6d31a6da77d8692c9b9ab7b53db6b2..3c30610b76ba9f48522c12a6689a97fe3bc8663b 100644
--- a/src/qgcunittest/MavlinkLogTest.cc
+++ b/src/qgcunittest/MavlinkLogTest.cc
@@ -34,7 +34,8 @@
 #include "UAS.h"
 #include "MultiVehicleManager.h"
 
-UT_REGISTER_TEST(MavlinkLogTest)
+// FIXME: Temporarily disabled until this can be stabilized
+//UT_REGISTER_TEST(MavlinkLogTest)
 
 const char* MavlinkLogTest::_tempLogFileTemplate = "FlightDataXXXXXX"; ///< Template for temporary log file
 const char* MavlinkLogTest::_logFileExtension = "mavlink";             ///< Extension for log files