diff --git a/pom.xml b/pom.xml
index 86f7a59e..90a37abb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,6 @@
 		<gemfire.version>9.1.1</gemfire.version>
 		<google-code-findbugs.version>2.0.2</google-code-findbugs.version>
 		<multithreadedtc.version>1.01</multithreadedtc.version>
-		<servlet-api.version>2.5</servlet-api.version>
 		<springdata.commons>2.0.0.BUILD-SNAPSHOT</springdata.commons>
 		<spring-shell.version>1.2.0.RELEASE</spring-shell.version>
 	</properties>
@@ -141,16 +140,9 @@
 
 		<!-- Test -->
 		<dependency>
-			<groupId>javax.el</groupId>
-			<artifactId>el-api</artifactId>
-			<version>${cdi}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>${servlet-api.version}</version>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+			<version>${javax-annotation-api}</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -162,8 +154,8 @@
 		</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>
diff --git a/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java
index 1de3abc0..8ec16c41 100644
--- a/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/repository/cdi/CdiExtensionIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2012-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,9 @@
 
 package org.springframework.data.gemfire.repository.cdi;
 
+import javax.enterprise.inject.se.SeContainer;
+import javax.enterprise.inject.se.SeContainerInitializer;
+
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;
@@ -26,8 +29,6 @@ import static org.junit.Assert.assertThat;
 
 import org.apache.geode.cache.CacheClosedException;
 import org.apache.geode.cache.CacheFactory;
-import org.apache.webbeans.cditest.CdiTestContainer;
-import org.apache.webbeans.cditest.CdiTestContainerLoader;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -37,26 +38,28 @@ import org.springframework.data.gemfire.repository.sample.Person;
  * The CdiExtensionIntegrationTest class...
  *
  * @author John Blum
+ * @author Mark Paluch
  * @see org.junit.Test
  * @see org.springframework.data.gemfire.repository.cdi.GemfireRepositoryBean
  * @see org.springframework.data.gemfire.repository.cdi.GemfireRepositoryExtension
- * @see org.apache.webbeans.cditest.CdiTestContainer
- * @see org.apache.webbeans.cditest.CdiTestContainerLoader
  * @since 1.8.0
  */
 public class CdiExtensionIntegrationTest {
 
-	static CdiTestContainer container;
+	static SeContainer container;
 
 	@BeforeClass
-	public static void setUp() throws Exception {
-		container = CdiTestContainerLoader.getCdiContainer();
-		container.bootContainer();
+	public static void setUp() {
+
+		container = SeContainerInitializer.newInstance() //
+				.disableDiscovery() //
+				.addPackages(RepositoryClient.class) //
+				.initialize();
 	}
 
 	@AfterClass
-	public static void tearDown() throws Exception {
-		container.shutdownContainer();
+	public static void tearDown() {
+		container.close();
 		closeGemfireCache();
 	}
 
@@ -74,9 +77,10 @@ public class CdiExtensionIntegrationTest {
 		assertThat(actual.getLastname(), is(equalTo(expected.getLastname())));
 	}
 
-	@Test
+	@Test // SGF-669
 	public void bootstrapsRepositoryCorrectly() {
-		RepositoryClient repositoryClient = container.getInstance(RepositoryClient.class);
+
+		RepositoryClient repositoryClient = container.select(RepositoryClient.class).get();
 
 		assertThat(repositoryClient.getPersonRepository(), is(notNullValue()));
 
@@ -98,9 +102,10 @@ public class CdiExtensionIntegrationTest {
 		assertThat(repositoryClient.find(foundJonDoe.getId()), is(nullValue()));
 	}
 
-	@Test
+	@Test // SGF-669
 	public void returnOneFromCustomImplementation() {
-		RepositoryClient repositoryClient = container.getInstance(RepositoryClient.class);
+
+		RepositoryClient repositoryClient = container.select(RepositoryClient.class).get();
 
 		assertThat(repositoryClient.getPersonRepository().returnOne(), is(equalTo(1)));
 	}
diff --git a/src/test/resources/META-INF/beans.xml b/src/test/resources/META-INF/beans.xml
deleted file mode 100644
index 002e5567..00000000
--- a/src/test/resources/META-INF/beans.xml
+++ /dev/null
@@ -1,5 +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>