diff --git a/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java b/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java
index a1bd65228..32925cbe5 100644
--- a/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java
+++ b/src/main/java/org/springframework/datastore/graph/neo4j/jpa/Neo4jEntityManager.java
@@ -38,7 +38,7 @@ public class Neo4jEntityManager implements EntityManager {
     private final FinderFactory finderFactory;
 
     @Resource
-    private Neo4jEntityManagerFactory neo4jEntityManagerFactory;
+    private EntityManagerFactory entityManagerFactory;
 
     public Neo4jEntityManager(final GraphDatabaseService graphDatabaseService, final EntityInstantiator<NodeBacked, Node> nodeInstantiator, final PersistenceUnitInfo info, final Map params, final IndexService indexService) {
         this.graphDatabaseService = graphDatabaseService;
@@ -319,7 +319,7 @@ public class Neo4jEntityManager implements EntityManager {
 
     @Override
     public EntityManagerFactory getEntityManagerFactory() {
-        return neo4jEntityManagerFactory;
+        return entityManagerFactory;
     }
 
     @Override
diff --git a/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml b/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml
index cdca7a28d..27d784fef 100644
--- a/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml
+++ b/src/test/resources/org/springframework/datastore/graph/neo4j/spi/Neo4jGraphPersistenceTest-context.xml
@@ -102,7 +102,7 @@
 
 	<!--
  	-->
-	<bean id="transactionManager" class="org.springframework.persistence.transaction.NaiveDoubleTransactionManager" >
+	<!--bean id="transactionManager" class="org.springframework.persistence.transaction.NaiveDoubleTransactionManager" >
 		<constructor-arg>
 			 <bean class="org.springframework.jdbc.datasource.DataSourceTransactionManager" >
 			 	<property name="dataSource" ref="dataSource"/>
@@ -115,8 +115,12 @@
 			    <property name="userTransaction" ref="neo4jUserTransactionService" />
 			</bean>
 		</constructor-arg>
-	</bean>
+	</bean-->
 
+    <bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager">
+                <property name="transactionManager" ref="neo4jTransactionManagerService" />
+                <property name="userTransaction" ref="neo4jUserTransactionService" />
+    </bean>
 
 	<bean id="neo4jTransactionManagerService" class="org.neo4j.kernel.impl.transaction.SpringTransactionManager" >
 	  <constructor-arg index="0" ref="graphDbService" />
@@ -126,12 +130,12 @@
 	    <constructor-arg index="0" ref="graphDbService" />
 	</bean>
 	
-	<bean class="org.springframework.jdbc.datasource.DriverManagerDataSource" id="dataSource">
+	<!--bean class="org.springframework.jdbc.datasource.DriverManagerDataSource" id="dataSource">
         <property name="driverClassName" value="${database.driverClassName}"/>
         <property name="url" value="${database.url}"/>
         <property name="username" value="${database.username}"/>
         <property name="password" value="${database.password}"/>
-    </bean>
+    </bean-->
  
     <tx:annotation-driven mode="aspectj" transaction-manager="transactionManager"/>