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
index 6fc1a8975a..138db10a30 100644
--- 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
@@ -6,6 +6,7 @@ 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;
 
@@ -15,6 +16,12 @@ public class SimpleJNDIUnitTest {
 
     @BeforeEach
     public void setup() throws Exception {
+        System.setProperty("java.naming.factory.initial", "org.osjava.sj.SimpleContextFactory");
+        System.setProperty("org.osjava.sj.root", "file://src/test/resources");
+        System.setProperty("org.osjava.sj.delimiter", ".");
+        System.setProperty("jndi.syntax.separator", "/");
+        System.setProperty("org.osjava.sj.space", "java:/comp/env");
+        
         this.initContext = new InitialContext();
     }
 
@@ -26,5 +33,16 @@ public class SimpleJNDIUnitTest {
 
         assertEquals(dsString, ds.toString());
     }
+    
+    @AfterEach
+    public void tearDown() throws Exception {
+        System.clearProperty("java.naming.factory.initial");
+        System.clearProperty("org.osjava.sj.root");
+        System.clearProperty("org.osjava.sj.delimiter");
+        System.clearProperty("jndi.syntax.separator");
+        System.clearProperty("org.osjava.sj.space");
+        
+        this.initContext = null;
+    }
 
 }
\ No newline at end of file