diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/repository/AddressRepositoryTest.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/repository/AddressRepositoryTest.java
index 18e995716..2cac386bc 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/repository/AddressRepositoryTest.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/repository/AddressRepositoryTest.java
@@ -43,7 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
  */
 @Transactional
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={"file:src/main/webapp/WEB-INF/spring-servlet.xml", "classpath:test-context.xml"})
+@ContextConfiguration(locations={"file:src/main/webapp/WEB-INF/application-context.xml", "classpath:test-context.xml"})
 public class AddressRepositoryTest {
 	
     @Autowired
diff --git a/openid-connect-server/src/test/java/org/mitre/openid/connect/repository/EventRepositoryTest.java b/openid-connect-server/src/test/java/org/mitre/openid/connect/repository/EventRepositoryTest.java
index e946f76f6..d5040c57e 100644
--- a/openid-connect-server/src/test/java/org/mitre/openid/connect/repository/EventRepositoryTest.java
+++ b/openid-connect-server/src/test/java/org/mitre/openid/connect/repository/EventRepositoryTest.java
@@ -49,7 +49,7 @@ import com.google.common.collect.Lists;
  */
 @Transactional
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(locations={"file:src/main/webapp/WEB-INF/spring-servlet.xml", "classpath:test-context.xml"})
+@ContextConfiguration(locations={"file:src/main/webapp/WEB-INF/application-context.xml", "classpath:test-context.xml"})
 public class EventRepositoryTest {
 	
     @Autowired