diff --git a/spring-webflow/.classpath b/spring-webflow/.classpath
index d6f7beee..5575c81a 100644
--- a/spring-webflow/.classpath
+++ b/spring-webflow/.classpath
@@ -37,7 +37,21 @@
 	<classpathentry kind="lib" path="lib/buildtime/persistence-api.jar"/>
 	<classpathentry kind="lib" path="lib/test/shale-test.jar"/>
 	<classpathentry kind="lib" path="lib/global/jboss-el.jar"/>
-	<classpathentry kind="lib" path="lib/test/toplink-essentials.jar"/>
 	<classpathentry kind="lib" path="lib/buildtime/spring-jpa.jar"/>
+	<classpathentry kind="lib" path="lib/test/antlr.jar"/>
+	<classpathentry kind="lib" path="lib/test/asm.jar"/>
+	<classpathentry kind="lib" path="lib/test/asm-attrs.jar"/>
+	<classpathentry kind="lib" path="lib/test/cglib.jar"/>
+	<classpathentry kind="lib" path="lib/test/clover.jar"/>
+	<classpathentry kind="lib" path="lib/test/ehcache.jar"/>
+	<classpathentry kind="lib" path="lib/test/freemarker.jar"/>
+	<classpathentry kind="lib" path="lib/test/hibernate-annotations.jar"/>
+	<classpathentry kind="lib" path="lib/test/hibernate-commons-annotations.jar"/>
+	<classpathentry kind="lib" path="lib/test/hibernate-entitymanager.jar"/>
+	<classpathentry kind="lib" path="lib/test/hibernate-tools.jar"/>
+	<classpathentry kind="lib" path="lib/test/hibernate-validator.jar"/>
+	<classpathentry kind="lib" path="lib/test/javassist.jar"/>
+	<classpathentry kind="lib" path="lib/test/jboss-common-core.jar"/>
+	<classpathentry kind="lib" path="lib/test/jtidy.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/spring-webflow/ivy.xml b/spring-webflow/ivy.xml
index 27d1fb0f..23134a1c 100644
--- a/spring-webflow/ivy.xml
+++ b/spring-webflow/ivy.xml
@@ -72,8 +72,10 @@
 		<dependency org="org.springframework" name="spring-mock" rev="2.0.6" conf="test->default" />
 		<dependency org="org.springframework" name="spring-agent" rev="2.0.6" conf="test->default" />
 		<dependency org="org.apache.shale" name="shale-test" rev="1.0.4" conf="test->default" />
-		<dependency org="toplink.essentials" name="toplink-essentials" rev="2.0-56" conf="test->default" />
-		<dependency org="toplink.essentials" name="toplink-essentials-agent" rev="2.0-56" conf="test->default" />
+		<dependency org="org.hibernate" name="hibernate" rev="3.2.4.ga" conf="test->default"/>
+		<dependency org="org.hibernate" name="hibernate-tools" rev="3.2.0.beta9a" conf="test->default"/>
+		<dependency org="org.hibernate" name="hibernate-entitymanager" rev="3.3.1.ga" conf="test->default"/>
+		<dependency org="org.hibernate" name="hibernate-commons-annotations" rev="3.3.0.ga" conf="test->default"/>
 
 	</dependencies>
 
diff --git a/spring-webflow/src/main/java/org/springframework/webflow/support/persistence/JpaFlowExecutionListener.java b/spring-webflow/src/main/java/org/springframework/webflow/support/persistence/JpaFlowExecutionListener.java
index b5ce895b..da5fcbbd 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/support/persistence/JpaFlowExecutionListener.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/support/persistence/JpaFlowExecutionListener.java
@@ -93,7 +93,7 @@ public class JpaFlowExecutionListener extends FlowExecutionListenerAdapter {
     public void sessionCreated(RequestContext context, FlowSession session) {
 	if (session.getDefinition().getAttributes().contains("persistenceContext")) {
 	    EntityManager em = entityManagerFactory.createEntityManager();
-	    context.getFlowScope().put(ENTITY_MANAGER_ATTRIBUTE, em);
+	    session.getScope().put(ENTITY_MANAGER_ATTRIBUTE, em);
 	    bind(em);
 	}
     }
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/JpaFlowExecutionListenerTests.java b/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/JpaFlowExecutionListenerTests.java
index a26967a9..eef71bfb 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/JpaFlowExecutionListenerTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/support/persistence/JpaFlowExecutionListenerTests.java
@@ -8,13 +8,12 @@ import javax.sql.DataSource;
 
 import junit.framework.TestCase;
 
-import org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.orm.jpa.JpaTemplate;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.orm.jpa.vendor.TopLinkJpaVendorAdapter;
+import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.webflow.engine.EndState;
 import org.springframework.webflow.test.MockFlowSession;
@@ -31,10 +30,9 @@ public class JpaFlowExecutionListenerTests extends TestCase {
     private JpaTemplate jpaTemplate;
 
     public void testTemp() {
-	
+
     }
-    
-    /*
+
     protected void setUp() throws Exception {
 	DataSource dataSource = getDataSource();
 	populateDataBase(dataSource);
@@ -107,11 +105,10 @@ public class JpaFlowExecutionListenerTests extends TestCase {
 	LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
 	factory.setDataSource(dataSource);
 	factory.setPersistenceXmlLocation("classpath:org/springframework/webflow/support/persistence/persistence.xml");
-	TopLinkJpaVendorAdapter toplink = new TopLinkJpaVendorAdapter();
-	factory.setJpaVendorAdapter(toplink);
-	factory.setLoadTimeWeaver(new InstrumentationLoadTimeWeaver());
+	HibernateJpaVendorAdapter hibernate = new HibernateJpaVendorAdapter();
+	factory.setJpaVendorAdapter(hibernate);
 	factory.afterPropertiesSet();
-	return (EntityManagerFactory) factory.getObject();
+	return factory.getObject();
     }
 
     private void assertSessionNotBound() {
@@ -121,5 +118,5 @@ public class JpaFlowExecutionListenerTests extends TestCase {
     private void assertSessionBound() {
 	assertNotNull(TransactionSynchronizationManager.getResource(entityManagerFactory));
     }
-    */
+
 }