diff --git a/java-rmi/src/test/java/com/baeldung/rmi/JavaRMIIntegrationTest.java b/java-rmi/src/test/java/com/baeldung/rmi/JavaRMIIntegrationTest.java
index 5e4ecb3e76..604899de03 100644
--- a/java-rmi/src/test/java/com/baeldung/rmi/JavaRMIIntegrationTest.java
+++ b/java-rmi/src/test/java/com/baeldung/rmi/JavaRMIIntegrationTest.java
@@ -1,42 +1,42 @@
 package com.baeldung.rmi;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.rmi.NotBoundException;
 import java.rmi.RemoteException;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 public class JavaRMIIntegrationTest {
-	
-	@BeforeClass
-	public static void whenRunServer_thenServerStarts() {
-		
-		try {
-			MessengerServiceImpl server = new MessengerServiceImpl();
-			server.createStubAndBind();
-		} catch (RemoteException e) {
-			fail("Exception Occurred: " + e);
-		}
-	}
-	
-	@Test
-	public void whenClientSendsMessageToServer_thenServerSendsResponseMessage() {
-		
-		try {
-			Registry registry = LocateRegistry.getRegistry();	
-			MessengerService server = (MessengerService) registry.lookup("MessengerService");			
-			String responseMessage = server.sendMessage("Client Message");		
-			
-			String expectedMessage = "Server Message";			
-			assertEquals(responseMessage, expectedMessage);
-		} catch (RemoteException | NotBoundException e) {
-			fail("Exception Occurred: " + e);
-		};
-	}
-	
+
+    private MessengerServiceImpl messengerService;
+
+    @Before
+    public void init() {
+        try {
+            messengerService = new MessengerServiceImpl();
+            messengerService.createStubAndBind();
+        } catch (RemoteException e) {
+            fail("Exception Occurred: " + e);
+        }
+    }
+
+    @Test
+    public void whenClientSendsMessageToServer_thenServerSendsResponseMessage() {
+        try {
+            Registry registry = LocateRegistry.getRegistry();
+            MessengerService server = (MessengerService) registry.lookup("MessengerService");
+            String responseMessage = server.sendMessage("Client Message");
+
+            String expectedMessage = "Server Message";
+            assertEquals(responseMessage, expectedMessage);
+        } catch (RemoteException | NotBoundException e) {
+            fail("Exception Occurred: " + e);
+        }
+    }
+
 }
\ No newline at end of file