diff --git a/pom.xml b/pom.xml
index 6a6346d97..1e027c312 100644
--- a/pom.xml
+++ b/pom.xml
@@ -213,26 +213,19 @@
 		</dependency>
 
 		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>el-api</artifactId>
-			<version>${cdi}</version>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+			<version>${javax-annotation-api}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.openwebbeans.test</groupId>
-			<artifactId>cditest-owb</artifactId>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-se</artifactId>
 			<version>${webbeans}</version>
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<version>3.0.1</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
diff --git a/src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java b/src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java
index cace66d73..eb4edc11a 100644
--- a/src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/cdi/CdiExtensionIntegrationTests.java
@@ -21,10 +21,10 @@ import static org.junit.Assert.*;
 import java.util.Set;
 
 import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.se.SeContainer;
+import javax.enterprise.inject.se.SeContainerInitializer;
 import javax.enterprise.inject.spi.Bean;
 
-import org.apache.webbeans.cditest.CdiTestContainer;
-import org.apache.webbeans.cditest.CdiTestContainerLoader;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Integration tests for Spring Data JPA CDI extension.
- * 
+ *
  * @author Dirk Mahler
  * @author Oliver Gierke
  * @author Mark Paluch
@@ -41,18 +41,20 @@ public class CdiExtensionIntegrationTests {
 
 	private static Logger LOGGER = LoggerFactory.getLogger(CdiExtensionIntegrationTests.class);
 
-	static CdiTestContainer container;
+	static SeContainer container;
 
 	@BeforeClass
-	public static void setUp() throws Exception {
+	public static void setUp() {
 
-		container = CdiTestContainerLoader.getCdiContainer();
-		container.bootContainer();
+		container = SeContainerInitializer.newInstance() //
+				.disableDiscovery() //
+				.addPackages(PersonRepository.class) //
+				.initialize();
 
 		LOGGER.debug("CDI container bootstrapped!");
 	}
 
-	@Test // DATAJPA-319
+	@Test // DATAJPA-319, DATAJPA-1180
 	@SuppressWarnings("rawtypes")
 	public void foo() {
 
@@ -62,27 +64,27 @@ public class CdiExtensionIntegrationTests {
 		assertThat(beans.iterator().next().getScope(), is(equalTo((Class) ApplicationScoped.class)));
 	}
 
-	@Test
+	@Test // DATAJPA-136, DATAJPA-1180
 	public void saveAndFindAll() {
 
-		RepositoryConsumer repositoryConsumer = container.getInstance(RepositoryConsumer.class);
+		RepositoryConsumer repositoryConsumer = container.select(RepositoryConsumer.class).get();
 
 		Person person = new Person();
 		repositoryConsumer.save(person);
 		repositoryConsumer.findAll();
 	}
 
-	@Test // DATAJPA-584
+	@Test // DATAJPA-584, DATAJPA-1180
 	public void returnOneFromCustomImpl() {
 
-		RepositoryConsumer repositoryConsumer = container.getInstance(RepositoryConsumer.class);
+		RepositoryConsumer repositoryConsumer = container.select(RepositoryConsumer.class).get();
 		assertThat(repositoryConsumer.returnOne(), is(1));
 	}
 
-	@Test // DATAJPA-584
+	@Test // DATAJPA-584, DATAJPA-1180
 	public void useQualifiedCustomizedUserRepo() {
 
-		RepositoryConsumer repositoryConsumer = container.getInstance(RepositoryConsumer.class);
+		RepositoryConsumer repositoryConsumer = container.select(RepositoryConsumer.class).get();
 		repositoryConsumer.doSomethonOnUserDB();
 	}
 }
diff --git a/src/test/resources/META-INF/beans.xml b/src/test/resources/META-INF/beans.xml
deleted file mode 100644
index 73ae3a251..000000000
--- a/src/test/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://java.sun.com/xml/ns/javaee" 
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
-</beans>
-