diff --git a/src/NzbDrone.Core/Download/DownloadClientFactory.cs b/src/NzbDrone.Core/Download/DownloadClientFactory.cs
index ee155cb905..ba5ea27f2e 100644
--- a/src/NzbDrone.Core/Download/DownloadClientFactory.cs
+++ b/src/NzbDrone.Core/Download/DownloadClientFactory.cs
@@ -74,10 +74,19 @@ public override ValidationResult Test(DownloadClientDefinition definition)
         {
             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;
         }
diff --git a/src/NzbDrone.Core/ImportLists/ImportListFactory.cs b/src/NzbDrone.Core/ImportLists/ImportListFactory.cs
index b2511702bb..abd47f38a3 100644
--- a/src/NzbDrone.Core/ImportLists/ImportListFactory.cs
+++ b/src/NzbDrone.Core/ImportLists/ImportListFactory.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using FluentValidation.Results;
 using NLog;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
@@ -77,5 +78,26 @@ private IEnumerable<IImportList> FilterBlockedImportLists(IEnumerable<IImportLis
                 yield return importList;
             }
         }
+
+        public override ValidationResult Test(ImportListDefinition definition)
+        {
+            var result = base.Test(definition);
+
+            if (definition.Id == 0)
+            {
+                return result;
+            }
+
+            if (result == null || result.IsValid)
+            {
+                _importListStatusService.RecordSuccess(definition.Id);
+            }
+            else
+            {
+                _importListStatusService.RecordFailure(definition.Id);
+            }
+
+            return result;
+        }
     }
 }