diff --git a/build.gradle b/build.gradle
index b8405e39..5af62a36 100644
--- a/build.gradle
+++ b/build.gradle
@@ -94,21 +94,22 @@ configure(publishedProjects) {
     }
 
     dependencies {
-        compile group: 'commons-codec', name: 'commons-codec', version: commonCodecVersion
+        implementation group: 'commons-codec', name: 'commons-codec', version: commonCodecVersion
 
-        testCompile group: 'junit', name: 'junit', version: junitVersion
-        testCompile group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
-        testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: hamcrestVersion
-        testCompile group: 'com.google.guava', name: 'guava', version: guavaVersion
+        testImplementation group: 'junit', name: 'junit', version: junitVersion
+        testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
+        testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version: hamcrestVersion
+        testImplementation group: 'com.google.guava', name: 'guava', version: guavaVersion
 
         // logging dependencies (logback)
-        testCompile group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
-        testCompile group: 'ch.qos.logback', name: 'logback-core', version: logbackVersion
-
-        testCompile group: 'com.google.code.gson', name: 'gson', version: gsonVersion
-        testCompile group: 'org.json', name: 'json', version: jsonVersion
-        testCompile group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion
-        testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
+        testImplementation group: 'ch.qos.logback', name: 'logback-classic', version: logbackVersion
+        testImplementation group: 'ch.qos.logback', name: 'logback-core', version: logbackVersion
+        testImplementation 'org.mock-server:mockserver-netty:5.1.1'
+
+        testImplementation group: 'com.google.code.gson', name: 'gson', version: gsonVersion
+        testImplementation group: 'org.json', name: 'json', version: jsonVersion
+        testImplementation group: 'com.googlecode.json-simple', name: 'json-simple', version: jsonSimpleVersion
+        testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: jacksonVersion
     }
 
     def docTitle = "Optimizely Java SDK"
diff --git a/core-httpclient-impl/build.gradle b/core-httpclient-impl/build.gradle
index 8fad0a93..a81f4cc3 100644
--- a/core-httpclient-impl/build.gradle
+++ b/core-httpclient-impl/build.gradle
@@ -2,8 +2,6 @@ dependencies {
     implementation project(':core-api')
     compileOnly group: 'com.google.code.gson', name: 'gson', version: gsonVersion
     implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: httpClientVersion
-
-    testImplementation 'org.mock-server:mockserver-netty:5.15.0'
 }
 
 task exhaustiveTest {
diff --git a/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java b/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java
index 9b188aff..d80a4f1e 100644
--- a/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java
+++ b/core-httpclient-impl/src/test/java/com/optimizely/ab/OptimizelyHttpClientTest.java
@@ -64,7 +64,7 @@ public void tearDown() {
     @Test
     public void testDefaultConfiguration() {
         OptimizelyHttpClient.Builder builder = builder();
-        assertEquals(builder.validateAfterInactivity, 5000);
+        assertEquals(builder.validateAfterInactivity, 1000);
         assertEquals(builder.maxTotalConnections, 200);
         assertEquals(builder.maxPerRoute, 20);
         assertNull(builder.customRetryHandler);
diff --git a/core-httpclient-impl/src/test/java/com/optimizely/ab/event/AsyncEventHandlerTest.java b/core-httpclient-impl/src/test/java/com/optimizely/ab/event/AsyncEventHandlerTest.java
index 34a15ef8..19f1faba 100644
--- a/core-httpclient-impl/src/test/java/com/optimizely/ab/event/AsyncEventHandlerTest.java
+++ b/core-httpclient-impl/src/test/java/com/optimizely/ab/event/AsyncEventHandlerTest.java
@@ -136,7 +136,7 @@ public void testBuilderWithCustomHttpClient() {
     @Test
     public void testBuilderWithDefaultHttpClient() {
         AsyncEventHandler.Builder builder = builder();
-        assertEquals(builder.validateAfterInactivity, 5000);
+        assertEquals(builder.validateAfterInactivity, 1000);
         assertEquals(builder.maxTotalConnections, 200);
         assertEquals(builder.maxPerRoute, 20);