diff --git a/pom.xml b/pom.xml
index 185770bae..225dcba3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
 		<spring.version>3.0.5.RELEASE</spring.version>
 		<hibernate.version>3.6.0.Final</hibernate.version>
 		<openjpa.version>2.0.0</openjpa.version>
+		<eclipselink.version>2.2.0</eclipselink.version>
 		<aspectj.version>1.6.8</aspectj.version>
 		<junit.version>4.8.1</junit.version>
 		<jpa.version>2.0.0</jpa.version>
@@ -368,7 +369,7 @@
 		<dependency>
 			<groupId>org.eclipse.persistence</groupId>
 			<artifactId>org.eclipse.persistence.jpa</artifactId>
-			<version>2.0.0</version>
+			<version>${eclipselink.version}</version>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
diff --git a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java
index 260768be7..1e4549e05 100644
--- a/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/EclipseLinkNamespaceUserRepositoryTests.java
@@ -15,20 +15,19 @@
  */
 package org.springframework.data.jpa.repository;
 
-import org.junit.Ignore;
 import org.springframework.data.jpa.repository.sample.UserRepository;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
 
 
 /**
  * Testcase to run {@link UserRepository} integration tests on top of
- * EclipseLink. So far not running as of an EclipseLink bug.
+ * EclipseLink.
  * 
- * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=312132
  * @author Oliver Gierke
  */
-// @ContextConfiguration(value = "classpath:eclipselink.xml", inheritLocations =
-// true)
-@Ignore
+@DirtiesContext
+@ContextConfiguration(value = "classpath:eclipselink.xml", inheritLocations = true)
 public class EclipseLinkNamespaceUserRepositoryTests extends
         NamespaceUserRepositoryTests {
 
diff --git a/src/test/resources/eclipselink.xml b/src/test/resources/eclipselink.xml
new file mode 100644
index 000000000..3e2e44eb5
--- /dev/null
+++ b/src/test/resources/eclipselink.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+
+	<!-- EclipseLink vendor adaptor with workaround platform class for HSQL usage -->
+	<bean id="vendorAdaptor" class="org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter" parent="abstractVendorAdaptor" />	
+	
+	<util:properties id="jpaProperties">
+		<prop key="javax.persistence.jdbc.driver">org.hsqldb.jdbcDriver</prop>
+		<prop key="javax.persistence.jdbc.url">jdbc:hsqldb:mem:hades</prop>
+		<prop key="javax.persistence.jdbc.user">sa</prop>
+		<prop key="javax.persistence.jdbc.password"></prop>
+		<prop key="javax.persistence.ddl-generation">create-tables</prop>
+	</util:properties>
+
+</beans>