diff --git a/pom.xml b/pom.xml
index 5526c1e2a3..0808397464 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
         <module>apache-cxf</module>
         <!-- <module>apache-fop</module> --> <!-- TODO: has a compilation issue -->
         <module>autovalue-tutorial</module>
-        
+
         <module>cdi</module>
         <module>core-java</module>
         <module>core-java-8</module>
@@ -69,7 +69,6 @@
         <module>rest-assured</module>
         <module>rest-testing</module>
         <module>resteasy</module>
-        <module>okhttp</module>
 
         <module>spring-all</module>
         <module>spring-akka</module>
diff --git a/spring-rest/README.md b/spring-rest/README.md
index 7d993b38b8..77d12063ed 100644
--- a/spring-rest/README.md
+++ b/spring-rest/README.md
@@ -5,8 +5,9 @@
 ###The Course
 The "REST With Spring" Classes: http://bit.ly/restwithspring
 
-### Relevant Articles: 
+### Relevant Articles:
 - [Spring @RequestMapping](http://www.baeldung.com/spring-requestmapping)
 - [Http Message Converters with the Spring Framework](http://www.baeldung.com/spring-httpmessageconverter-rest)
 - [Redirect in Spring](http://www.baeldung.com/spring-redirect-and-forward)
 - [Returning Custom Status Codes from Spring Controllers](http://www.baeldung.com/spring-mvc-controller-custom-http-status-code)
+- [A Guide to OkHttp](http://www.baeldung.com/guide-to-okhttp)
diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpFileUploadingTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpFileUploadingLiveTest.java
similarity index 95%
rename from spring-rest/src/test/java/org/baeldung/okhttp/OkHttpFileUploadingTest.java
rename to spring-rest/src/test/java/org/baeldung/okhttp/OkHttpFileUploadingLiveTest.java
index 77219b8e22..d1cc67b99a 100644
--- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpFileUploadingTest.java
+++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpFileUploadingLiveTest.java
@@ -18,7 +18,7 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 
-public class OkHttpFileUploadingTest {
+public class OkHttpFileUploadingLiveTest {
 
     private static final String BASE_URL = "http://localhost:8080/spring-rest";
 
diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java
similarity index 94%
rename from spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetTest.java
rename to spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java
index de954e3dd7..9a49c8d9a2 100644
--- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetTest.java
+++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java
@@ -14,7 +14,7 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
-public class OkHttpGetTest {
+public class OkHttpGetLiveTest {
 
     private static final String BASE_URL = "http://localhost:8080/spring-rest";
 
diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpHeaderTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpHeaderLiveTest.java
similarity index 93%
rename from spring-rest/src/test/java/org/baeldung/okhttp/OkHttpHeaderTest.java
rename to spring-rest/src/test/java/org/baeldung/okhttp/OkHttpHeaderLiveTest.java
index 958eeb51ce..8eddfcb135 100644
--- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpHeaderTest.java
+++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpHeaderLiveTest.java
@@ -9,7 +9,7 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
-public class OkHttpHeaderTest {
+public class OkHttpHeaderLiveTest {
 
     private static final String SAMPLE_URL = "http://www.github.com";
 
diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java
similarity index 95%
rename from spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscTest.java
rename to spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java
index fe15a76200..c44500f4be 100644
--- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscTest.java
+++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java
@@ -16,10 +16,10 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
-public class OkHttpMiscTest {
+public class OkHttpMiscLiveTest {
 
     private static final String BASE_URL = "http://localhost:8080/spring-rest";
-    private static Logger logger = LoggerFactory.getLogger(OkHttpMiscTest.class);
+    private static Logger logger = LoggerFactory.getLogger(OkHttpMiscLiveTest.class);
 
     @Test
     public void whenSetRequestTimeout_thenFail() throws IOException {
diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpPostingTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpPostingLiveTest.java
similarity index 95%
rename from spring-rest/src/test/java/org/baeldung/okhttp/OkHttpPostingTest.java
rename to spring-rest/src/test/java/org/baeldung/okhttp/OkHttpPostingLiveTest.java
index 41a024d2ee..18bd4cdcb3 100644
--- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpPostingTest.java
+++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpPostingLiveTest.java
@@ -18,7 +18,7 @@ import okhttp3.Request;
 import okhttp3.RequestBody;
 import okhttp3.Response;
 
-public class OkHttpPostingTest {
+public class OkHttpPostingLiveTest {
 
     private static final String BASE_URL = "http://localhost:8080/spring-rest";
     private static final String URL_SECURED_BY_BASIC_AUTHENTICATION = "http://browserspy.dk/password-ok.php";
diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpRedirectTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpRedirectLiveTest.java
similarity index 91%
rename from spring-rest/src/test/java/org/baeldung/okhttp/OkHttpRedirectTest.java
rename to spring-rest/src/test/java/org/baeldung/okhttp/OkHttpRedirectLiveTest.java
index c709253478..d568a4fdf7 100644
--- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpRedirectTest.java
+++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpRedirectLiveTest.java
@@ -12,7 +12,7 @@ import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 
-public class OkHttpRedirectTest {
+public class OkHttpRedirectLiveTest {
 
     @Test
     public void whenSetFollowRedirects_thenNotRedirected() throws IOException {