diff --git a/src/plugins/simulator/flightgear/simulatorflightgear.cpp b/src/plugins/simulator/flightgear/simulatorflightgear.cpp
index 2c13cfd54..54431efc7 100644
--- a/src/plugins/simulator/flightgear/simulatorflightgear.cpp
+++ b/src/plugins/simulator/flightgear/simulatorflightgear.cpp
@@ -480,7 +480,7 @@ namespace BlackSimPlugin
 
             // crosscheck if still a valid aircraft
             // it can happen that aircraft has been removed, timed out ...
-            if (!this->isAircraftInRange(newRemoteAircraft.getCallsign()))
+            if (!this->isAircraftInRangeOrTestMode(newRemoteAircraft.getCallsign()))
             {
                 // next cycle will be called by callbacks or timer
                 CLogMessage(this).warning(u"Aircraft '%1' no longer in range, will not add") << newRemoteAircraft.getCallsign();
diff --git a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
index 3adfbb73f..e809dd620 100644
--- a/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
+++ b/src/plugins/simulator/fsxcommon/simulatorfsxcommon.cpp
@@ -1175,7 +1175,7 @@ namespace BlackSimPlugin
         void CSimulatorFsxCommon::timerBasedObjectAddOrRemove()
         {
             this->addPendingAircraft(AddByTimer);
-            this->physicallyRemoveAircraftNotInProvider();
+            if (!this->isTestMode()) { this->physicallyRemoveAircraftNotInProvider(); }
         }
 
         void CSimulatorFsxCommon::addPendingAircraftAfterAdded()
diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp
index bbaac8d4d..6cdbd3ed7 100644
--- a/src/plugins/simulator/xplane/simulatorxplane.cpp
+++ b/src/plugins/simulator/xplane/simulatorxplane.cpp
@@ -325,6 +325,7 @@ namespace BlackSimPlugin
 
                 // remove the invalid ones
                 int i = 0;
+                if (this->isTestMode()) { invalid.clear(); } // skip this in test mode
                 for (const CCallsign &cs : invalid)
                 {
                     this->triggerRemoveAircraft(cs, ++i * 100);