diff --git a/pom.xml b/pom.xml
index 02489d5b..2bb46d8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,7 +77,8 @@
     <properties>
         <!-- Dependency Versions -->
         <commons-logging.version>1.2</commons-logging.version>
-        <kubernetes-client.version>1.3.83</kubernetes-client.version>
+        <kubernetes-client.version>1.4.6</kubernetes-client.version>
+        <mockwebserver.version>0.0.4</mockwebserver.version>
         <lombok.version>1.16.8</lombok.version>
         <servlet-api.version>2.5</servlet-api.version>
         <spock-spring.version>1.0-groovy-2.3</spock-spring.version>
@@ -200,6 +201,13 @@
             </dependency>
 
             <!-- Testing Dependencies -->
+            <dependency>
+                <groupId>io.fabric8</groupId>
+                <artifactId>mockwebserver</artifactId>
+                <version>${mockwebserver.version}</version>
+                <scope>test</scope>
+            </dependency>
+
             <dependency>
                 <groupId>io.fabric8</groupId>
                 <artifactId>kubernetes-client</artifactId>
diff --git a/spring-cloud-kubernetes-core/pom.xml b/spring-cloud-kubernetes-core/pom.xml
index 3e3330de..dd0b23ce 100644
--- a/spring-cloud-kubernetes-core/pom.xml
+++ b/spring-cloud-kubernetes-core/pom.xml
@@ -82,7 +82,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp</groupId>
+            <groupId>io.fabric8</groupId>
             <artifactId>mockwebserver</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/spring-cloud-kubernetes-ribbon/pom.xml b/spring-cloud-kubernetes-ribbon/pom.xml
index 9e65ac24..dd1844de 100644
--- a/spring-cloud-kubernetes-ribbon/pom.xml
+++ b/spring-cloud-kubernetes-ribbon/pom.xml
@@ -118,11 +118,10 @@
         </dependency>
 
         <dependency>
-            <groupId>com.squareup.okhttp</groupId>
+            <groupId>io.fabric8</groupId>
             <artifactId>mockwebserver</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.spockframework</groupId>
             <artifactId>spock-spring</artifactId>
diff --git a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy
index 923f43c7..ef68edc9 100644
--- a/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy
+++ b/spring-cloud-kubernetes-ribbon/src/test/groovy/io/fabric8/spring/cloud/kubernetes/ribbon/test/RibbonTest.groovy
@@ -72,11 +72,11 @@ class RibbonTest extends Specification {
                     .withName("testapp-a")
                 .endMetadata()
                 .addNewSubset()
-                    .addNewAddresse().withIp(mockEndpointA.getServer().hostName).endAddresse()
+                    .addNewAddress().withIp(mockEndpointA.getServer().hostName).endAddress()
                     .addNewPort("http", mockEndpointA.getServer().port, "http")
                 .endSubset()
                 .addNewSubset()
-                .addNewAddresse().withIp(mockEndpointB.getServer().hostName).endAddresse()
+                .addNewAddress().withIp(mockEndpointB.getServer().hostName).endAddress()
                     .addNewPort("http", mockEndpointB.getServer().port, "http")
                 .endSubset()
                 .build()).always()