diff --git a/spring-credhub-core/build.gradle b/spring-credhub-core/build.gradle
index 5635466..48fef17 100644
--- a/spring-credhub-core/build.gradle
+++ b/spring-credhub-core/build.gradle
@@ -26,7 +26,6 @@ dependencies {
 	optional(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3') {
 		exclude(group: 'commons-logging', module: 'commons-logging')
 	}
-	optional group: 'com.squareup.okhttp', name: 'okhttp', version: '2.7.5'
 	optional group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
 	optional group: 'io.netty', name: 'netty-all', version: '4.1.8.Final'
 
diff --git a/spring-credhub-core/src/main/java/org/springframework/credhub/configuration/ClientHttpRequestFactoryFactory.java b/spring-credhub-core/src/main/java/org/springframework/credhub/configuration/ClientHttpRequestFactoryFactory.java
index b2e652c..5b08142 100644
--- a/spring-credhub-core/src/main/java/org/springframework/credhub/configuration/ClientHttpRequestFactoryFactory.java
+++ b/spring-credhub-core/src/main/java/org/springframework/credhub/configuration/ClientHttpRequestFactoryFactory.java
@@ -28,7 +28,6 @@ import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509TrustManager;
 
-import com.squareup.okhttp.OkHttpClient;
 import io.netty.handler.ssl.ClientAuth;
 import io.netty.handler.ssl.JdkSslContext;
 import io.netty.handler.ssl.SslContext;
@@ -44,7 +43,6 @@ import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.client.Netty4ClientHttpRequestFactory;
 import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
-import org.springframework.http.client.OkHttpClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
@@ -64,10 +62,6 @@ public class ClientHttpRequestFactoryFactory {
 			"org.apache.http.client.HttpClient",
 			ClientHttpRequestFactoryFactory.class.getClassLoader());
 
-	private static final boolean OKHTTP_PRESENT = ClassUtils.isPresent(
-			"com.squareup.okhttp.OkHttpClient",
-			ClientHttpRequestFactoryFactory.class.getClassLoader());
-
 	private static final boolean OKHTTP3_PRESENT = ClassUtils.isPresent(
 			"okhttp3.OkHttpClient",
 			ClientHttpRequestFactoryFactory.class.getClassLoader());
@@ -98,11 +92,6 @@ public class ClientHttpRequestFactoryFactory {
 				return OkHttp3.usingOkHttp3(options);
 			}
 
-			if (OKHTTP_PRESENT) {
-				logger.info("Using OkHttp for HTTP connections");
-				return OkHttp.usingOkHttp(options);
-			}
-
 			if (NETTY_PRESENT) {
 				logger.info("Using Netty for HTTP connections");
 				return Netty.usingNetty(options);
@@ -165,44 +154,7 @@ public class ClientHttpRequestFactoryFactory {
 	}
 
 	/**
-	 * {@link ClientHttpRequestFactory} using {@link OkHttpClient}.
-	 *
-	 * @author Mark Paluch
-	 * @author Scott Frederick
-	 */
-	static class OkHttp {
-		static ClientHttpRequestFactory usingOkHttp(ClientOptions options)
-				throws IOException, GeneralSecurityException {
-
-			final OkHttpClient okHttpClient = new OkHttpClient();
-
-			okHttpClient.setSslSocketFactory(SSLContext.getDefault().getSocketFactory());
-
-			OkHttpClientHttpRequestFactory requestFactory =
-					new OkHttpClientHttpRequestFactory(okHttpClient) {
-				@Override
-				public void destroy() throws IOException {
-					if (okHttpClient.getCache() != null) {
-						okHttpClient.getCache().close();
-					}
-
-					okHttpClient.getDispatcher().getExecutorService().shutdown();
-				}
-			};
-
-			if (options.getConnectionTimeout() != null) {
-				requestFactory.setConnectTimeout(options.getConnectionTimeout());
-			}
-			if (options.getReadTimeout() != null) {
-				requestFactory.setReadTimeout(options.getReadTimeout());
-			}
-
-			return requestFactory;
-		}
-	}
-
-	/**
-	 * {@link ClientHttpRequestFactory} using {@link OkHttpClient}.
+	 * {@link ClientHttpRequestFactory} using {@link OkHttp3}.
 	 *
 	 * @author Mark Paluch
 	 * @author Scott Frederick
diff --git a/spring-credhub-core/src/test/java/org/springframework/credhub/configuration/ClientHttpRequestFactoryFactoryTests.java b/spring-credhub-core/src/test/java/org/springframework/credhub/configuration/ClientHttpRequestFactoryFactoryTests.java
index 5ebc3e4..c1ff58f 100644
--- a/spring-credhub-core/src/test/java/org/springframework/credhub/configuration/ClientHttpRequestFactoryFactoryTests.java
+++ b/spring-credhub-core/src/test/java/org/springframework/credhub/configuration/ClientHttpRequestFactoryFactoryTests.java
@@ -26,7 +26,6 @@ import org.springframework.http.client.ClientHttpRequestFactory;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.client.Netty4ClientHttpRequestFactory;
 import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
-import org.springframework.http.client.OkHttpClientHttpRequestFactory;
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 
 import static org.hamcrest.Matchers.instanceOf;
@@ -34,7 +33,6 @@ import static org.junit.Assert.assertThat;
 import static org.springframework.credhub.configuration.ClientHttpRequestFactoryFactory.HttpComponents.usingHttpComponents;
 import static org.springframework.credhub.configuration.ClientHttpRequestFactoryFactory.HttpURLConnection.usingJdk;
 import static org.springframework.credhub.configuration.ClientHttpRequestFactoryFactory.Netty.usingNetty;
-import static org.springframework.credhub.configuration.ClientHttpRequestFactoryFactory.OkHttp.usingOkHttp;
 import static org.springframework.credhub.configuration.ClientHttpRequestFactoryFactory.OkHttp3.usingOkHttp3;
 
 public class ClientHttpRequestFactoryFactoryTests {
@@ -58,15 +56,6 @@ public class ClientHttpRequestFactoryFactoryTests {
 		((DisposableBean) factory).destroy();
 	}
 
-	@Test
-	public void okHttpClientCreated() throws Exception {
-		ClientHttpRequestFactory factory = usingOkHttp(new ClientOptions());
-
-		assertThat(factory, instanceOf(OkHttpClientHttpRequestFactory.class));
-
-		((DisposableBean) factory).destroy();
-	}
-
 	@Test
 	public void okHttp3ClientCreated() throws Exception {
 		ClientHttpRequestFactory factory = usingOkHttp3(new ClientOptions());
diff --git a/spring-credhub-starter/build.gradle b/spring-credhub-starter/build.gradle
index e1c7b1f..3a8f17e 100644
--- a/spring-credhub-starter/build.gradle
+++ b/spring-credhub-starter/build.gradle
@@ -39,7 +39,6 @@ dependencies {
 	optional(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3') {
 		exclude(group: 'commons-logging', module: 'commons-logging')
 	}
-	optional group: 'com.squareup.okhttp', name: 'okhttp', version: '2.7.5'
 	optional group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
 	optional group: 'io.netty', name: 'netty-all', version: '4.1.8.Final'