diff --git a/Octokit.Tests/Http/HttpClientAdapterTests.cs b/Octokit.Tests/Http/HttpClientAdapterTests.cs
index 029b7052..a9542cfc 100644
--- a/Octokit.Tests/Http/HttpClientAdapterTests.cs
+++ b/Octokit.Tests/Http/HttpClientAdapterTests.cs
@@ -187,6 +187,11 @@ namespace Octokit.Tests.Http
             {
                 return await BuildResponse(responseMessage);
             }
+
+            protected override HttpClientHandler GetHandler()
+            {
+                return new HttpClientHandler();
+            }
         }
     }
 
diff --git a/Octokit/Http/HttpClientAdapter.cs b/Octokit/Http/HttpClientAdapter.cs
index 22d6ec15..8f4f1a1c 100644
--- a/Octokit/Http/HttpClientAdapter.cs
+++ b/Octokit/Http/HttpClientAdapter.cs
@@ -21,6 +21,7 @@ namespace Octokit.Internal
         readonly IWebProxy _webProxy;
         readonly HttpClient _http;
 
+        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
         public HttpClientAdapter()
         {
@@ -28,6 +29,7 @@ namespace Octokit.Internal
             _http = new HttpClient(new RedirectHandler { InnerHandler = handler });
         }
 
+        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
         public HttpClientAdapter(IWebProxy webProxy)
         {
@@ -36,6 +38,7 @@ namespace Octokit.Internal
             _http = new HttpClient(new RedirectHandler { InnerHandler = handler });
         }
 
+        [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
         public HttpClientAdapter(IWebProxy webProxy, HttpMessageHandler handler)
         {
@@ -82,8 +85,9 @@ namespace Octokit.Internal
             return cancellationTokenForRequest;
         }
 
+        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
         [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
-        HttpClientHandler GetHandler()
+        protected virtual HttpClientHandler GetHandler()
         {
             var httpOptions = new HttpClientHandler
             {