diff --git a/src/NzbDrone.Core/Applications/ApplicationFactory.cs b/src/NzbDrone.Core/Applications/ApplicationFactory.cs
index 31386ad50..1366744b4 100644
--- a/src/NzbDrone.Core/Applications/ApplicationFactory.cs
+++ b/src/NzbDrone.Core/Applications/ApplicationFactory.cs
@@ -62,10 +62,19 @@ namespace NzbDrone.Core.Applications
         {
             var result = base.Test(definition);
 
-            if ((result == null || result.IsValid) && definition.Id != 0)
+            if (definition.Id == 0)
+            {
+                return result;
+            }
+
+            if (result == null || result.IsValid)
             {
                 _applicationStatusService.RecordSuccess(definition.Id);
             }
+            else
+            {
+                _applicationStatusService.RecordFailure(definition.Id);
+            }
 
             return result;
         }
diff --git a/src/NzbDrone.Core/Download/DownloadClientFactory.cs b/src/NzbDrone.Core/Download/DownloadClientFactory.cs
index d692d36ee..bcad10a57 100644
--- a/src/NzbDrone.Core/Download/DownloadClientFactory.cs
+++ b/src/NzbDrone.Core/Download/DownloadClientFactory.cs
@@ -75,10 +75,19 @@ namespace NzbDrone.Core.Download
         {
             var result = base.Test(definition);
 
-            if ((result == null || result.IsValid) && definition.Id != 0)
+            if (definition.Id == 0)
+            {
+                return result;
+            }
+
+            if (result == null || result.IsValid)
             {
                 _downloadClientStatusService.RecordSuccess(definition.Id);
             }
+            else
+            {
+                _downloadClientStatusService.RecordFailure(definition.Id);
+            }
 
             return result;
         }