diff --git a/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs b/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs
new file mode 100644
index 000000000..dbcd56d99
--- /dev/null
+++ b/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs
@@ -0,0 +1,59 @@
+using FluentAssertions;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Indexers.Newznab;
+using NzbDrone.Core.Indexers.NzbClub;
+using NzbDrone.Core.Test.Framework;
+using NUnit.Framework;
+
+namespace NzbDrone.Core.Test.IndexerTests.IntegrationTests
+{
+    public class IndexerIntegrationTests : CoreTest<FetchFeedService>
+    {
+        [Test]
+        public void nzbclub_rss()
+        {
+            UseRealHttp();
+
+            var indexer = new NzbClub();
+
+            var result = Subject.FetchRss(indexer);
+
+            result.Should().NotBeEmpty();
+            result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.Title));
+            result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.NzbUrl));
+
+            //TODO: uncomment these after moving to restsharp for rss
+            //result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.NzbInfoUrl));
+            //result.Should().OnlyContain(c => c.Size > 0);
+
+        }
+
+        [Test]
+        [Explicit("needs newznab api key")]
+        public void nzbsorg_rss()
+        {
+            UseRealHttp();
+
+            var indexer = new Newznab();
+            indexer.Settings = new NewznabSettings
+                {
+                    ApiKey = "",
+                    Url = "http://nzbs.org"
+                };
+
+            indexer.InstanceDefinition = new IndexerDefinition();
+
+            var result = Subject.FetchRss(indexer);
+
+            result.Should().NotBeEmpty();
+            result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.Title));
+            result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.NzbUrl));
+
+            //TODO: uncomment these after moving to restsharp for rss
+            //result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.NzbInfoUrl));
+            //result.Should().OnlyContain(c => c.Size > 0);
+
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/NzbDrone.Core.Test/IndexerTests/IntegrationTests/NzbClubIntegrationTests.cs b/NzbDrone.Core.Test/IndexerTests/IntegrationTests/NzbClubIntegrationTests.cs
deleted file mode 100644
index 48f5fb60b..000000000
--- a/NzbDrone.Core.Test/IndexerTests/IntegrationTests/NzbClubIntegrationTests.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-using FluentAssertions;
-using NzbDrone.Core.Indexers;
-using NzbDrone.Core.Indexers.NzbClub;
-using NzbDrone.Core.Test.Framework;
-using NUnit.Framework;
-
-namespace NzbDrone.Core.Test.IndexerTests.IntegrationTests
-{
-    public class NzbClubIntegrationTests : CoreTest<FetchFeedService>
-    {
-        [Test]
-        public void should_be_able_to_fetch_rss()
-        {
-            UseRealHttp();
-
-            var indexer = new NzbClub();
-
-            var result = Subject.FetchRss(indexer);
-
-            result.Should().NotBeEmpty();
-            result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.Title));
-            result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.NzbUrl));
-
-            //TODO: uncomment these after moving to restsharp for rss
-            //result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.NzbInfoUrl));
-            //result.Should().OnlyContain(c => c.Size > 0);
-
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 3f4e1c03c..f52f2b163 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -138,7 +138,7 @@
     <Compile Include="IndexerTests\BasicRssParserFixture.cs" />
     <Compile Include="IndexerTests\IndexerServiceFixture.cs" />
     <Compile Include="IndexerTests\IntegrationTests\NzbxIntegrationTests.cs" />
-    <Compile Include="IndexerTests\IntegrationTests\NzbClubIntegrationTests.cs" />
+    <Compile Include="IndexerTests\IntegrationTests\IndexerIntegrationTests.cs" />
     <Compile Include="IndexerTests\ParserTests\NzbxParserFixture.cs" />
     <Compile Include="JobTests\JobRepositoryFixture.cs" />
     <Compile Include="DecisionEngineTests\LanguageSpecificationFixture.cs" />
diff --git a/NzbDrone.Core/Indexers/IndexerWithSetting.cs b/NzbDrone.Core/Indexers/IndexerWithSetting.cs
index 084a233dc..30d275fbd 100644
--- a/NzbDrone.Core/Indexers/IndexerWithSetting.cs
+++ b/NzbDrone.Core/Indexers/IndexerWithSetting.cs
@@ -5,7 +5,7 @@ namespace NzbDrone.Core.Indexers
 {
     public abstract class IndexerWithSetting<TSetting> : IndexerBase where TSetting : class, IIndexerSetting, new()
     {
-        public TSetting Settings { get; private set; }
+        public TSetting Settings { get; set; }
 
         public TSetting ImportSettingsFromJson(string json)
         {
diff --git a/NzbDrone.Core/Indexers/Newznab/Newznab.cs b/NzbDrone.Core/Indexers/Newznab/Newznab.cs
index 6e8ab1e64..2ad2236cb 100644
--- a/NzbDrone.Core/Indexers/Newznab/Newznab.cs
+++ b/NzbDrone.Core/Indexers/Newznab/Newznab.cs
@@ -54,7 +54,7 @@ namespace NzbDrone.Core.Indexers.Newznab
         {
             get
             {
-                var url = String.Format("{0}/api?t=tvsearch&cat=5030,5040,5070,5090s", Settings.Url);
+                var url = String.Format("{0}/api?t=tvsearch&cat=5000", Settings.Url);
 
                 if (!String.IsNullOrWhiteSpace(Settings.ApiKey))
                 {