diff --git a/src/NzbDrone.Test.Common/NzbDroneRunner.cs b/src/NzbDrone.Test.Common/NzbDroneRunner.cs
index 27bad483d..50466d5df 100644
--- a/src/NzbDrone.Test.Common/NzbDroneRunner.cs
+++ b/src/NzbDrone.Test.Common/NzbDroneRunner.cs
@@ -78,6 +78,11 @@ namespace NzbDrone.Test.Common
 
         public void KillAll()
         {
+            if (_nzbDroneProcess != null)
+            {
+                _processProvider.Kill(_nzbDroneProcess.Id);                
+            }
+
             _processProvider.KillAll(ProcessProvider.NZB_DRONE_CONSOLE_PROCESS_NAME);
             _processProvider.KillAll(ProcessProvider.NZB_DRONE_PROCESS_NAME);
         }