diff --git a/sockets/pom.xml b/sockets/pom.xml
index 1227667198..24e8e436f3 100644
--- a/sockets/pom.xml
+++ b/sockets/pom.xml
@@ -12,8 +12,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.3</version>
         <configuration>
-          <source>7</source>
-          <target>7</target>
+          <source>8</source>
+          <target>8</target>
         </configuration>
       </plugin>
     </plugins>
diff --git a/sockets/src/main/java/com/baeldung/socket/EchoClient.java b/sockets/src/main/java/com/baeldung/socket/EchoClient.java
index d008f4031a..54fcea3d51 100644
--- a/sockets/src/main/java/com/baeldung/socket/EchoClient.java
+++ b/sockets/src/main/java/com/baeldung/socket/EchoClient.java
@@ -15,7 +15,7 @@ public class EchoClient {
 			in = new BufferedReader(new InputStreamReader(
 					clientSocket.getInputStream()));
 		} catch (IOException e) {
-			
+			System.out.print(e);
 		}
 
 	}
diff --git a/sockets/src/main/java/com/baeldung/socket/GreetClient.java b/sockets/src/main/java/com/baeldung/socket/GreetClient.java
index a91b61d3ad..09f94a0bfc 100644
--- a/sockets/src/main/java/com/baeldung/socket/GreetClient.java
+++ b/sockets/src/main/java/com/baeldung/socket/GreetClient.java
@@ -41,6 +41,6 @@ public class GreetClient {
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-
 	}
+
 }
diff --git a/sockets/src/main/java/com/baeldung/socket/GreetServer.java b/sockets/src/main/java/com/baeldung/socket/GreetServer.java
index 34c801aea8..7595bddd02 100644
--- a/sockets/src/main/java/com/baeldung/socket/GreetServer.java
+++ b/sockets/src/main/java/com/baeldung/socket/GreetServer.java
@@ -21,7 +21,7 @@ public class GreetServer {
 			if ("hello server".equals(greeting))
 				out.println("hello client");
 			else
-				out.println("unrecognised greetin");
+				out.println("unrecognised greeting");
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
diff --git a/sockets/src/test/java/com/baeldung/socket/EchoMultiTest.java b/sockets/src/test/java/com/baeldung/socket/EchoMultiTest.java
index 55f41a539e..21b9bb9c19 100644
--- a/sockets/src/test/java/com/baeldung/socket/EchoMultiTest.java
+++ b/sockets/src/test/java/com/baeldung/socket/EchoMultiTest.java
@@ -1,17 +1,36 @@
 package com.baeldung.socket;
 
-import static org.junit.Assert.*;
-
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
+import java.util.concurrent.Executors;
+
+import static org.junit.Assert.assertEquals;
+
 public class EchoMultiTest {
+
+	{
+		Executors.newSingleThreadExecutor().submit(() -> new EchoMultiServer().start(5555));
+	}
+
+	EchoClient client = new EchoClient();
+
+	@Before
+	public void init() {
+		client.startConnection("127.0.0.1", 5555);
+	}
+
+	@After
+	public void finish(){
+		client.stopConnection();
+	}
+
 	@Test
 	public void givenClient1_whenServerResponds_thenCorrect() {
-		EchoClient client1 = new EchoClient();
-		client1.startConnection("127.0.0.1", 5555);
-		String msg1 = client1.sendMessage("hello");
-		String msg2 = client1.sendMessage("world");
-		String terminate = client1.sendMessage(".");
+		String msg1 = client.sendMessage("hello");
+		String msg2 = client.sendMessage("world");
+		String terminate = client.sendMessage(".");
 		assertEquals(msg1, "hello");
 		assertEquals(msg2, "world");
 		assertEquals(terminate, "bye");
@@ -19,11 +38,9 @@ public class EchoMultiTest {
 
 	@Test
 	public void givenClient2_whenServerResponds_thenCorrect() {
-		EchoClient client1 = new EchoClient();
-		client1.startConnection("127.0.0.1", 5555);
-		String msg1 = client1.sendMessage("hello");
-		String msg2 = client1.sendMessage("world");
-		String terminate = client1.sendMessage(".");
+		String msg1 = client.sendMessage("hello");
+		String msg2 = client.sendMessage("world");
+		String terminate = client.sendMessage(".");
 		assertEquals(msg1, "hello");
 		assertEquals(msg2, "world");
 		assertEquals(terminate, "bye");
@@ -31,11 +48,9 @@ public class EchoMultiTest {
 
 	@Test
 	public void givenClient3_whenServerResponds_thenCorrect() {
-		EchoClient client1 = new EchoClient();
-		client1.startConnection("127.0.0.1", 5555);
-		String msg1 = client1.sendMessage("hello");
-		String msg2 = client1.sendMessage("world");
-		String terminate = client1.sendMessage(".");
+		String msg1 = client.sendMessage("hello");
+		String msg2 = client.sendMessage("world");
+		String terminate = client.sendMessage(".");
 		assertEquals(msg1, "hello");
 		assertEquals(msg2, "world");
 		assertEquals(terminate, "bye");
diff --git a/sockets/src/test/java/com/baeldung/socket/EchoTest.java b/sockets/src/test/java/com/baeldung/socket/EchoTest.java
index fee626bc78..77b0492b4f 100644
--- a/sockets/src/test/java/com/baeldung/socket/EchoTest.java
+++ b/sockets/src/test/java/com/baeldung/socket/EchoTest.java
@@ -1,11 +1,11 @@
 package com.baeldung.socket;
 
-import static org.junit.Assert.assertEquals;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class EchoTest {
 	EchoClient client = null;
 
diff --git a/sockets/src/test/java/com/baeldung/socket/GreetServerTest.java b/sockets/src/test/java/com/baeldung/socket/GreetServerTest.java
index 9126fe9757..d5060b4fa4 100644
--- a/sockets/src/test/java/com/baeldung/socket/GreetServerTest.java
+++ b/sockets/src/test/java/com/baeldung/socket/GreetServerTest.java
@@ -1,16 +1,35 @@
 package com.baeldung.socket;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.concurrent.Executors;
+
 import static org.junit.Assert.assertEquals;
 
-import org.junit.Test;
-
 public class GreetServerTest {
-	@Test
-	public void givenGreetingClient_whenServerRespondsWhenStarted_thenCorrect() {
-		GreetClient client = new GreetClient();
-		client.startConnection("127.0.0.1", 6666);
-		String response = client.sendMessage("hello server");
-		assertEquals("hello client", response);
-	}
 
+    GreetClient client;
+
+    {
+        Executors.newSingleThreadExecutor().submit(() -> new GreetServer().start(6666));
+    }
+
+    @Before
+    public void init() {
+        client = new GreetClient();
+    }
+
+    @Test
+    public void givenGreetingClient_whenServerRespondsWhenStarted_thenCorrect() {
+        client.startConnection("127.0.0.1", 6666);
+        String response = client.sendMessage("hello server");
+        assertEquals("hello client", response);
+    }
+
+    @After
+    public void finish() {
+        client.stopConnection();
+    }
 }