diff --git a/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleJNDIUnitTest.java b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleJNDIUnitTest.java
new file mode 100644
index 0000000000..dbda32172d
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleJNDIUnitTest.java
@@ -0,0 +1,39 @@
+package com.baeldung.jndi.datasource;
+
+import static org.junit.Assert.assertEquals;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class SimpleJNDIUnitTest {
+
+    private InitialContext initContext;
+
+    @BeforeEach
+    public void setup() throws Exception {
+        this.initContext = new InitialContext();
+    }
+
+    @Test
+    public void whenMockJndiDataSource_thenReturnJndiDataSource() throws Exception {
+        String dsString = "org.h2.Driver::::jdbc:jdbc:h2:mem:testdb::::sa";
+        Context envContext = (Context) this.initContext.lookup("java:/comp/env");
+        DataSource ds = (DataSource) envContext.lookup("datasource/ds");
+
+        assertEquals(dsString, ds.toString());
+    }
+    
+    @AfterEach
+    public void tearDown() throws Exception {
+        if(this.initContext != null){
+            this.initContext.close();
+            this.initContext = null;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderUnitTest.java b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderUnitTest.java
index 7fdd47a77d..abaf24b2da 100644
--- a/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderUnitTest.java
+++ b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jndi/datasource/SimpleNamingContextBuilderUnitTest.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.assertNotNull;
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
@@ -28,5 +29,13 @@ public class SimpleNamingContextBuilderUnitTest {
 
         assertNotNull(ds.getConnection());
     }
+    
+    @AfterEach
+    public void tearDown() throws Exception {
+        if(this.initContext != null){
+            this.initContext.close();
+            this.initContext = null;
+        }
+    }
 
 }
\ No newline at end of file