diff --git a/NzbDrone.Common.Test/WebClientTests.cs b/NzbDrone.Common.Test/WebClientTests.cs
index 9c621cde4..6b7cbc356 100644
--- a/NzbDrone.Common.Test/WebClientTests.cs
+++ b/NzbDrone.Common.Test/WebClientTests.cs
@@ -6,12 +6,12 @@ using NzbDrone.Test.Common;
 namespace NzbDrone.Common.Test
 {
     [TestFixture]
-    public class WebClientTests : TestBase
+    public class WebClientTests : TestBase<HttpProvider>
     {
         [Test]
         public void DownloadString_should_be_able_to_dowload_text_file()
         {
-            var jquery = new HttpProvider(new EnvironmentProvider()).DownloadString("http://www.google.com/robots.txt");
+            var jquery = Subject.DownloadString("http://www.google.com/robots.txt");
 
             jquery.Should().NotBeBlank();
             jquery.Should().Contain("Sitemap");
@@ -23,7 +23,15 @@ namespace NzbDrone.Common.Test
         [ExpectedException]
         public void DownloadString_should_throw_on_error(string url)
         {
-            var jquery = new HttpProvider(new EnvironmentProvider()).DownloadString(url);
+            var jquery = Subject.DownloadString(url);
+        }
+    
+    
+        [Test]
+        public void should_get_headers()
+        {
+            Subject.GetHeader("http://www.google.com").Should().NotBeEmpty();
         }
     }
+
 }
diff --git a/NzbDrone.Common/HttpProvider.cs b/NzbDrone.Common/HttpProvider.cs
index 0897ca079..d3b9f67ac 100644
--- a/NzbDrone.Common/HttpProvider.cs
+++ b/NzbDrone.Common/HttpProvider.cs
@@ -13,7 +13,7 @@ namespace NzbDrone.Common
         string DownloadString(string address);
         string DownloadString(string address, string username, string password);
         string DownloadString(string address, ICredentials identity);
-        Dictionary<string, string> DownloadHeader(string url);
+        Dictionary<string, string> GetHeader(string url);
 
         Stream DownloadStream(string url, NetworkCredential credential = null);
         void DownloadFile(string url, string fileName);
@@ -60,7 +60,7 @@ namespace NzbDrone.Common
             }
         }
 
-        public Dictionary<string, string> DownloadHeader(string url)
+        public Dictionary<string, string> GetHeader(string url)
         {
             var headers = new Dictionary<string, string>();
             var request = WebRequest.Create(url);
@@ -68,7 +68,7 @@ namespace NzbDrone.Common
 
             var response = request.GetResponse();
 
-            foreach (var key in headers.Keys)
+            foreach (var key in response.Headers.AllKeys)
             {
                 headers.Add(key, response.Headers[key]);
             }
diff --git a/NzbDrone.Core.Test/MediaCoverTests/CoverExistsSpecificationFixture.cs b/NzbDrone.Core.Test/MediaCoverTests/CoverExistsSpecificationFixture.cs
index faffdacf0..0c87594df 100644
--- a/NzbDrone.Core.Test/MediaCoverTests/CoverExistsSpecificationFixture.cs
+++ b/NzbDrone.Core.Test/MediaCoverTests/CoverExistsSpecificationFixture.cs
@@ -19,7 +19,7 @@ namespace NzbDrone.Core.Test.MediaCoverTests
         {
             _headers = new Dictionary<string, string>();
             Mocker.GetMock<IDiskProvider>().Setup(c => c.GetFileSize(It.IsAny<string>())).Returns(100);
-            Mocker.GetMock<IHttpProvider>().Setup(c => c.DownloadHeader(It.IsAny<string>())).Returns(_headers);
+            Mocker.GetMock<IHttpProvider>().Setup(c => c.GetHeader(It.IsAny<string>())).Returns(_headers);
 
         }
 
diff --git a/NzbDrone.Core/MediaCover/CoverAlreadyExistsSpecification.cs b/NzbDrone.Core/MediaCover/CoverAlreadyExistsSpecification.cs
index 87d8151a1..fd4bcff52 100644
--- a/NzbDrone.Core/MediaCover/CoverAlreadyExistsSpecification.cs
+++ b/NzbDrone.Core/MediaCover/CoverAlreadyExistsSpecification.cs
@@ -29,7 +29,7 @@ namespace NzbDrone.Core.MediaCover
                 return false;
             }
 
-            var headers = _httpProvider.DownloadHeader(url);
+            var headers = _httpProvider.GetHeader(url);
 
             string sizeString;