diff --git a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
index 43bc92af092..2f267472071 100644
--- a/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
+++ b/okhttp/src/main/java/io/grpc/okhttp/OkHttpChannelBuilder.java
@@ -208,7 +208,7 @@ public static OkHttpChannelBuilder forTarget(String target, ChannelCredentials c
    */
   private final boolean useGetForSafeMethods = false;
 
-  private static ConnectionSpec initialConnectionSpec() {
+  static ConnectionSpec initialConnectionSpec() {
     return (OkHttpProtocolNegotiator.get() instanceof OkHttpProtocolNegotiator.AndroidNegotiator)
         ? INTERNAL_DEFAULT_CONNECTION_SPEC
         : INTERNAL_LEGACY_CONNECTION_SPEC;
diff --git a/okhttp/src/main/java/io/grpc/okhttp/SslSocketFactoryServerCredentials.java b/okhttp/src/main/java/io/grpc/okhttp/SslSocketFactoryServerCredentials.java
index ad9af056afc..0c04aa63fad 100644
--- a/okhttp/src/main/java/io/grpc/okhttp/SslSocketFactoryServerCredentials.java
+++ b/okhttp/src/main/java/io/grpc/okhttp/SslSocketFactoryServerCredentials.java
@@ -41,7 +41,7 @@ static final class ServerCredentials extends io.grpc.ServerCredentials {
     private final ConnectionSpec connectionSpec;
 
     ServerCredentials(SSLSocketFactory factory) {
-      this(factory, OkHttpChannelBuilder.INTERNAL_LEGACY_CONNECTION_SPEC);
+      this(factory, OkHttpChannelBuilder.initialConnectionSpec());
     }
 
     ServerCredentials(SSLSocketFactory factory, ConnectionSpec connectionSpec) {