diff --git a/src/qgcunittest/UnitTest.cc b/src/qgcunittest/UnitTest.cc
index 5193dbf10a61829c22efb9d74f5f969b5d211f78..cb4c661744baf1e7e1bbbd20e430632a57fe1223 100644
--- a/src/qgcunittest/UnitTest.cc
+++ b/src/qgcunittest/UnitTest.cc
@@ -17,6 +17,8 @@
 #include "QGCApplication.h"
 #include "MAVLinkProtocol.h"
 #include "Vehicle.h"
+#include "AppSettings.h"
+#include "SettingsManager.h"
 
 #include <QTemporaryFile>
 #include <QTime>
@@ -103,6 +105,11 @@ void UnitTest::init(void)
     }
 
     _linkManager->restart();
+
+    // Force offline vehicle back to defaults
+    AppSettings* appSettings = qgcApp()->toolbox()->settingsManager()->appSettings();
+    appSettings->offlineEditingFirmwareType()->setRawValue(appSettings->offlineEditingFirmwareType()->rawDefaultValue());
+    appSettings->offlineEditingVehicleType()->setRawValue(appSettings->offlineEditingVehicleType()->rawDefaultValue());
     
     _messageBoxRespondedTo = false;
     _missedMessageBoxCount = 0;