diff --git a/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties b/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties
new file mode 100644
index 0000000000..c353245f14
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi.properties
@@ -0,0 +1,6 @@
+java.naming.factory.initial=org.osjava.sj.SimpleContextFactory
+org.osjava.sj.jndi.shared=true
+org.osjava.sj.delimiter=.
+jndi.syntax.separator=/
+org.osjava.sj.space=java:/comp/env
+org.osjava.sj.root=src/test/resources/jndi
diff --git a/persistence-modules/spring-persistence-simple-2/src/test/resources/datasource.properties b/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi/datasource.properties
similarity index 81%
rename from persistence-modules/spring-persistence-simple-2/src/test/resources/datasource.properties
rename to persistence-modules/spring-persistence-simple-2/src/test/resources/jndi/datasource.properties
index a86a6c6ce2..8be94daf36 100644
--- a/persistence-modules/spring-persistence-simple-2/src/test/resources/datasource.properties
+++ b/persistence-modules/spring-persistence-simple-2/src/test/resources/jndi/datasource.properties
@@ -2,4 +2,4 @@ ds.type=javax.sql.DataSource
 ds.driver=org.h2.Driver
 ds.url=jdbc:jdbc:h2:mem:testdb
 ds.user=sa
-ds.password=password
\ No newline at end of file
+ds.password=password