diff --git a/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/JndiUnitTest.java b/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/JndiUnitTest.java
index 9eea420e7a..34bd1340f9 100644
--- a/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/JndiUnitTest.java
+++ b/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/JndiUnitTest.java
@@ -1,5 +1,6 @@
 package com.baeldung.jndi;
 
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
@@ -56,5 +57,11 @@ class JndiUnitTest {
         assertNotNull(ds);
         assertNotNull(ds.getConnection());
     }
+    
+    @AfterAll
+    static void tearDown() throws Exception {
+       ctx.close();
+    }
+
 
 }
diff --git a/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java b/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java
index 218807568c..7ca0c91925 100644
--- a/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java
+++ b/core-java-modules/core-java-jndi/src/test/java/com/baeldung/jndi/exceptions/JndiExceptionsUnitTest.java
@@ -6,7 +6,6 @@ import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
 import javax.naming.NoInitialContextException;
 
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.MethodOrderer;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
@@ -16,14 +15,17 @@ import org.springframework.mock.jndi.SimpleNamingContextBuilder;
 
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class JndiExceptionsUnitTest {
+    
+    InitialContext ctx;
 
     @Test
     @Order(1)
     void givenNoContext_whenLookupObject_thenThrowNoInitialContext() {
         assertThrows(NoInitialContextException.class, () -> {
             JndiTemplate jndiTemplate = new JndiTemplate();
-            InitialContext ctx = (InitialContext) jndiTemplate.getContext();
+            ctx = (InitialContext) jndiTemplate.getContext();
             ctx.lookup("java:comp/env/jdbc/datasource");
+            ctx.close();
         }).printStackTrace();
     }
 
@@ -35,8 +37,9 @@ public class JndiExceptionsUnitTest {
             builder.activate();
 
             JndiTemplate jndiTemplate = new JndiTemplate();
-            InitialContext ctx = (InitialContext) jndiTemplate.getContext();
+            ctx = (InitialContext) jndiTemplate.getContext();
             ctx.lookup("badJndiName");
+            ctx.close();
         }).printStackTrace();
     }