diff --git a/src/NzbDrone.Core/Download/DownloadClientFactory.cs b/src/NzbDrone.Core/Download/DownloadClientFactory.cs
index 21a049f10..8ba7be505 100644
--- a/src/NzbDrone.Core/Download/DownloadClientFactory.cs
+++ b/src/NzbDrone.Core/Download/DownloadClientFactory.cs
@@ -76,7 +76,7 @@ public override ValidationResult Test(DownloadClientDefinition definition)
         {
             var result = base.Test(definition);
 
-            if (result == null && definition.Id != 0)
+            if ((result == null || result.IsValid) && definition.Id != 0)
             {
                 _downloadClientStatusService.RecordSuccess(definition.Id);
             }
diff --git a/src/NzbDrone.Core/Indexers/IndexerFactory.cs b/src/NzbDrone.Core/Indexers/IndexerFactory.cs
index e133f3a62..0d918b980 100644
--- a/src/NzbDrone.Core/Indexers/IndexerFactory.cs
+++ b/src/NzbDrone.Core/Indexers/IndexerFactory.cs
@@ -90,7 +90,7 @@ public override ValidationResult Test(IndexerDefinition definition)
         {
             var result = base.Test(definition);
 
-            if (result == null && definition.Id != 0)
+            if ((result == null || result.IsValid) && definition.Id != 0)
             {
                 _indexerStatusService.RecordSuccess(definition.Id);
             }