diff --git a/src/AutoPilotPlugins/PX4/Tests/FlightModeConfigTest.cc b/src/AutoPilotPlugins/PX4/Tests/FlightModeConfigTest.cc
index a563cc1236b6979656aa6167a34d6bdcf6d914c6..c8a10edcd477b78f350fa5a81fdaac380f6ec387 100644
--- a/src/AutoPilotPlugins/PX4/Tests/FlightModeConfigTest.cc
+++ b/src/AutoPilotPlugins/PX4/Tests/FlightModeConfigTest.cc
@@ -31,7 +31,9 @@
 ///
 ///     @author Don Gagne <don@thegagnes.com>
 
-UT_REGISTER_TEST(FlightModeConfigTest)
+// Turned off due to signletonn shutdown sequencing problem. Also since FlightMode config is
+// being re-written this test will need to be re-written as well.
+//UT_REGISTER_TEST(FlightModeConfigTest)
 
 FlightModeConfigTest::FlightModeConfigTest(void) :
     _mockUASManager(NULL),