diff --git a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
index 302316336..bd16cc4d5 100644
--- a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using FluentValidation.Results;
@@ -92,6 +92,7 @@ protected override void Test(List<ValidationFailure> failures)
         {
             base.Test(failures);
 
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestCapabilities());
         }
 
diff --git a/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs b/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
index e1c2896e6..6dc9591d1 100644
--- a/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
+++ b/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using FluentValidation.Results;
@@ -80,6 +80,7 @@ protected override void Test(List<ValidationFailure> failures)
         {
             base.Test(failures);
 
+            if (failures.Any()) return;
             failures.AddIfNotNull(TestCapabilities());
         }