diff --git a/pom.xml b/pom.xml
index c7e6f5a91..8ced98a29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,26 +132,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>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>test</scope>
-		</dependency>
-
 		<!-- Test -->
 
 		<dependency>
diff --git a/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java b/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java
index c5ac3cfb3..d53f2c1d3 100644
--- a/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java
+++ b/src/test/java/org/springframework/data/redis/repository/cdi/CdiExtensionIntegrationTests.java
@@ -22,10 +22,11 @@ import java.util.List;
 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.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -40,18 +41,25 @@ 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(RepositoryConsumer.class) //
+				.initialize();
 
 		LOGGER.debug("CDI container bootstrapped!");
 	}
 
-	@Test // DATAREDIS-425
+	@AfterClass
+	public static void cleanUp() {
+		container.close();
+	}
+
+	@Test // DATAREDIS-425, DATAREDIS-700
 	@SuppressWarnings("rawtypes")
 	public void beanShouldBeRegistered() {
 
@@ -61,10 +69,10 @@ public class CdiExtensionIntegrationTests {
 		assertThat(beans.iterator().next().getScope(), is(equalTo((Class) ApplicationScoped.class)));
 	}
 
-	@Test // DATAREDIS-425
+	@Test // DATAREDIS-425, DATAREDIS-700
 	public void saveAndFindUnqualified() {
 
-		RepositoryConsumer repositoryConsumer = container.getInstance(RepositoryConsumer.class);
+		RepositoryConsumer repositoryConsumer = container.select(RepositoryConsumer.class).get();
 		repositoryConsumer.deleteAll();
 
 		Person person = new Person();
@@ -75,10 +83,10 @@ public class CdiExtensionIntegrationTests {
 		assertThat(result, contains(person));
 	}
 
-	@Test // DATAREDIS-425
+	@Test // DATAREDIS-425, DATAREDIS-700
 	public void saveAndFindQualified() {
 
-		RepositoryConsumer repositoryConsumer = container.getInstance(RepositoryConsumer.class);
+		RepositoryConsumer repositoryConsumer = container.select(RepositoryConsumer.class).get();
 		repositoryConsumer.deleteAll();
 
 		Person person = new Person();
@@ -88,15 +96,13 @@ public class CdiExtensionIntegrationTests {
 
 		assertThat(result, contains(person));
 	}
-	
-	
-	@Test // DATAREDIS-425
+
+	@Test // DATAREDIS-425, DATAREDIS-700
 	public void callMethodOnCustomRepositoryShouldSuceed() {
 
-		RepositoryConsumer repositoryConsumer = container.getInstance(RepositoryConsumer.class);
+		RepositoryConsumer repositoryConsumer = container.select(RepositoryConsumer.class).get();
 
 		int result = repositoryConsumer.getUnqualifiedRepo().returnOne();
 		assertThat(result, is(1));
 	}
-
 }
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>
-