diff --git a/persistence-modules/java-mongodb-2/src/main/java/com/baeldung/mongo/ConnectionCheck.java b/persistence-modules/java-mongodb-2/src/main/java/com/baeldung/mongo/ConnectionCheck.java
index 240e54ab99..df17e27351 100644
--- a/persistence-modules/java-mongodb-2/src/main/java/com/baeldung/mongo/ConnectionCheck.java
+++ b/persistence-modules/java-mongodb-2/src/main/java/com/baeldung/mongo/ConnectionCheck.java
@@ -7,7 +7,7 @@ import com.mongodb.ServerAddress;
 
 public class ConnectionCheck {
 
-    public static void checkingConnection() {
+    public static MongoClient checkingConnection() {
 
         MongoClientOptions.Builder builder = MongoClientOptions.builder();
 
@@ -27,9 +27,10 @@ public class ConnectionCheck {
             System.out.println(db.getStats());
         } catch (Exception e) {
             System.out.println("MongoDB Server is Down");
-            mongoClient.close();
         }
 
+        return mongoClient;
+
     }
 
     public static void main(String[] args) {
@@ -42,5 +43,4 @@ public class ConnectionCheck {
 
     }
 
-}
-
+}
\ No newline at end of file
diff --git a/persistence-modules/java-mongodb-2/src/test/java/com/baeldung/mongo/ConnectionCheckLiveTest.java b/persistence-modules/java-mongodb-2/src/test/java/com/baeldung/mongo/ConnectionCheckLiveTest.java
index 69f356997c..32014a4473 100644
--- a/persistence-modules/java-mongodb-2/src/test/java/com/baeldung/mongo/ConnectionCheckLiveTest.java
+++ b/persistence-modules/java-mongodb-2/src/test/java/com/baeldung/mongo/ConnectionCheckLiveTest.java
@@ -3,45 +3,22 @@ package com.baeldung.mongo;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 
-import java.io.IOException;
-
-import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.baeldung.ConnectionCheck;
 import com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
-import com.mongodb.ServerAddress;
 
 public class ConnectionCheckLiveTest {
 
-    private static MongoClient mongoClient;
-    private static MongoClientOptions.Builder builder;
-    private static ServerAddress ServerAddress;
-
-    @BeforeClass
-    public static void setup() throws IOException {
-        if (mongoClient == null) {
-
-            builder = MongoClientOptions.builder();
-            builder.connectionsPerHost(100);
-            builder.maxWaitTime(60000);
-            builder.connectTimeout(1500);
-            builder.socketTimeout(60000);
-            builder.socketKeepAlive(true);
-
-            ServerAddress = new ServerAddress("localhost", 27017);
-            mongoClient = new MongoClient(ServerAddress, builder.build());
-
-        }
-    }
+    ConnectionCheck ConnectionCheck = new ConnectionCheck();
 
     @Test
     public void givenMongoClient_whenConnectionCheck_thenCheckingForConnectionPoint() {
 
+        MongoClient mongoClient = ConnectionCheck.checkingConnection();
         String connectionPoint = mongoClient.getConnectPoint();
         assertNotNull(connectionPoint);
         assertFalse(connectionPoint.isEmpty());
 
     }
-}
-
+}
\ No newline at end of file