diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests-config.xml b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests-config.xml
deleted file mode 100644
index 4dd740157..000000000
--- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests-config.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	- DispatcherServlet application context for PetClinic's web tier.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <bean id="validatorFactory" class="javax.validation.Validation"
-        factory-method="buildDefaultValidatorFactory" />
-
-    <bean id="validator" factory-bean="validatorFactory"
-        factory-method="getValidator" />
-
-</beans>
diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
index 298cf6bfe..354c15a9f 100644
--- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
@@ -12,6 +12,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
 
 /**
  * 
@@ -20,12 +21,13 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * (useful when upgrading to a new version of Hibernate Validator/ Bean Validation)
  *
  */
-@ContextConfiguration("ValidatorTests-config.xml")
-@RunWith(SpringJUnit4ClassRunner.class)
 public class ValidatorTests {
 	
-	@Autowired
-    private Validator validator;
+	private Validator createValidator() {
+	      LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean();
+	      localValidatorFactoryBean.afterPropertiesSet();
+	      return localValidatorFactoryBean;
+	  }
 
 	@Test
     public void emptyFirstName() {
@@ -34,6 +36,7 @@ public class ValidatorTests {
         person.setFirstName("");
         person.setLastName("smith");
 
+        Validator validator = createValidator();
         Set<ConstraintViolation<Person>> constraintViolations = validator.validate(person);
 
         Assert.assertEquals(1, constraintViolations.size());