diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpFileUploadingLiveTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpFileUploadingLiveTest.java
index 2c88408017..2f75560e03 100644
--- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpFileUploadingLiveTest.java
+++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpFileUploadingLiveTest.java
@@ -8,6 +8,7 @@ import java.io.File;
 import java.io.IOException;
 
 import org.baeldung.okhttp.ProgressRequestWrapper;
+import org.junit.Before;
 import org.junit.Test;
 
 import okhttp3.Call;
@@ -22,10 +23,18 @@ public class OkHttpFileUploadingLiveTest {
 
     private static final String BASE_URL = "http://localhost:8080/spring-rest";
 
+    OkHttpClient client;
+
+    @Before
+    public void init() {
+
+    	client = new OkHttpClient();
+    }
+
     @Test
     public void whenUploadFile_thenCorrect() throws IOException {
 
-        OkHttpClient client = new OkHttpClient();
+        client = new OkHttpClient();
 
         RequestBody requestBody = new MultipartBody.Builder()
           .setType(MultipartBody.FORM)
@@ -47,7 +56,7 @@ public class OkHttpFileUploadingLiveTest {
     @Test
     public void whenGetUploadFileProgress_thenCorrect() throws IOException {
 
-        OkHttpClient client = new OkHttpClient();
+    	client = new OkHttpClient();
 
         RequestBody requestBody = new MultipartBody.Builder()
           .setType(MultipartBody.FORM)
@@ -55,14 +64,11 @@ public class OkHttpFileUploadingLiveTest {
             RequestBody.create(MediaType.parse("application/octet-stream"), new File("src/test/resources/test.txt")))
           .build();
 
+        ProgressRequestWrapper countingBody = new ProgressRequestWrapper(requestBody, (long bytesWritten, long contentLength) -> {
 
-        ProgressRequestWrapper.ProgressListener listener = (bytesWritten, contentLength) -> {
-
-            float percentage = 100f * bytesWritten / contentLength;
+        	float percentage = 100f * bytesWritten / contentLength;
             assertFalse(Float.compare(percentage, 100) > 0);
-        };
-
-        ProgressRequestWrapper countingBody = new ProgressRequestWrapper(requestBody, listener);
+        });
 
         Request request = new Request.Builder()
                 .url(BASE_URL + "/users/upload")
diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java
index 3f773bf35e..f1dce530cd 100644
--- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java
+++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpGetLiveTest.java
@@ -4,19 +4,31 @@ import okhttp3.*;
 import org.junit.Test;
 
 import java.io.IOException;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
+import okhttp3.Call;
+import okhttp3.Callback;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 
 public class OkHttpGetLiveTest {
 
     private static final String BASE_URL = "http://localhost:8080/spring-rest";
 
+    OkHttpClient client;
+
+    @Before
+    public void init() {
+
+    	client = new OkHttpClient();
+    }
+
     @Test
     public void whenGetRequest_thenCorrect() throws IOException {
 
-        OkHttpClient client = new OkHttpClient();
+        client = new OkHttpClient();
 
         Request request = new Request.Builder()
           .url(BASE_URL + "/date")
@@ -31,7 +43,7 @@ public class OkHttpGetLiveTest {
     @Test
     public void whenGetRequestWithQueryParameter_thenCorrect() throws IOException {
 
-        OkHttpClient client = new OkHttpClient();
+        client = new OkHttpClient();
 
         HttpUrl.Builder urlBuilder = HttpUrl.parse(BASE_URL + "/ex/bars").newBuilder();
         urlBuilder.addQueryParameter("id", "1");
@@ -51,7 +63,7 @@ public class OkHttpGetLiveTest {
     @Test
     public void whenAsynchronousGetRequest_thenCorrect() throws InterruptedException {
 
-        OkHttpClient client = new OkHttpClient();
+        client = new OkHttpClient();
 
         Request request = new Request.Builder()
           .url(BASE_URL + "/date")
diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpHeaderLiveTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpHeaderLiveTest.java
index 8eddfcb135..1b73565aa4 100644
--- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpHeaderLiveTest.java
+++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpHeaderLiveTest.java
@@ -2,6 +2,7 @@ package org.baeldung.okhttp;
 
 import java.io.IOException;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import okhttp3.Call;
@@ -13,10 +14,18 @@ public class OkHttpHeaderLiveTest {
 
     private static final String SAMPLE_URL = "http://www.github.com";
 
+    OkHttpClient client;
+
+    @Before
+    public void init() {
+
+    	client = new OkHttpClient();
+    }
+
     @Test
     public void whenSetHeader_thenCorrect() throws IOException {
 
-        OkHttpClient client = new OkHttpClient();
+        client = new OkHttpClient();
 
         Request request = new Request.Builder()
           .url(SAMPLE_URL)
@@ -43,6 +52,4 @@ public class OkHttpHeaderLiveTest {
         Response response = call.execute();
         response.close();
     }
-
-
 }
diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java
index 9c38c8da51..3411f29c40 100644
--- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java
+++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpMiscLiveTest.java
@@ -4,18 +4,34 @@ import okhttp3.*;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import okhttp3.Cache;
+import okhttp3.Call;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 
 public class OkHttpMiscLiveTest {
 
     private static final String BASE_URL = "http://localhost:8080/spring-rest";
     private static Logger logger = LoggerFactory.getLogger(OkHttpMiscLiveTest.class);
 
+    OkHttpClient client;
+
+    @Before
+    public void init() {
+
+    	client = new OkHttpClient();
+    }
+
     @Test
     public void whenSetRequestTimeout_thenFail() throws IOException {
 
@@ -37,7 +53,7 @@ public class OkHttpMiscLiveTest {
 
         ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
 
-        OkHttpClient client = new OkHttpClient();
+        client = new OkHttpClient();
 
         Request request = new Request.Builder()
           .url(BASE_URL + "/delay/2")  // This URL is served with a 2 second delay.
diff --git a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpPostingLiveTest.java b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpPostingLiveTest.java
index 18bd4cdcb3..59844d547a 100644
--- a/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpPostingLiveTest.java
+++ b/spring-rest/src/test/java/org/baeldung/okhttp/OkHttpPostingLiveTest.java
@@ -6,6 +6,7 @@ import static org.junit.Assert.assertThat;
 import java.io.File;
 import java.io.IOException;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import okhttp3.Call;
@@ -23,10 +24,18 @@ 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";
 
+    OkHttpClient client;
+
+    @Before
+    public void init() {
+
+    	client = new OkHttpClient();
+    }
+
     @Test
     public void whenSendPostRequest_thenCorrect() throws IOException {
 
-        OkHttpClient client = new OkHttpClient();
+        client = new OkHttpClient();
 
         RequestBody formBody = new FormBody.Builder()
           .add("username", "test")
@@ -49,7 +58,7 @@ public class OkHttpPostingLiveTest {
 
         String postBody = "test post";
 
-        OkHttpClient client = new OkHttpClient();
+        client = new OkHttpClient();
 
         Request request = new Request.Builder()
                 .url(URL_SECURED_BY_BASIC_AUTHENTICATION)
@@ -66,7 +75,7 @@ public class OkHttpPostingLiveTest {
     @Test
     public void whenPostJson_thenCorrect() throws IOException {
 
-        OkHttpClient client = new OkHttpClient();
+        client = new OkHttpClient();
 
         String json = "{\"id\":1,\"name\":\"John\"}";
 
@@ -86,7 +95,7 @@ public class OkHttpPostingLiveTest {
     @Test
     public void whenSendMultipartRequest_thenCorrect() throws IOException {
 
-        OkHttpClient client = new OkHttpClient();
+        client = new OkHttpClient();
 
         RequestBody requestBody = new MultipartBody.Builder()
           .setType(MultipartBody.FORM)