diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java
index 571bea3b23..3559c3d9c5 100644
--- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java
+++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java
@@ -175,21 +175,21 @@ public class SampleIntegrationTests {
 
 	@Test
 	public void xmlSample() throws Exception {
-		start("samples/app.xml", "samples/runner.groovy");
+		start("samples/runner.xml", "samples/runner.groovy");
 		String output = this.outputCapture.getOutputAndRelease();
 		assertTrue("Wrong output: " + output, output.contains("Hello World"));
 	}
 
 	@Test
 	public void txSample() throws Exception {
-		start("samples/app.xml", "samples/tx.groovy");
+		start("samples/tx.groovy");
 		String output = this.outputCapture.getOutputAndRelease();
 		assertTrue("Wrong output: " + output, output.contains("Foo count="));
 	}
 
 	@Test
 	public void jmsSample() throws Exception {
-		start("samples/app.xml", "samples/jms.groovy");
+		start("samples/jms.groovy");
 		String output = this.outputCapture.getOutputAndRelease();
 		assertTrue("Wrong output: " + output,
 				output.contains("Received Greetings from Spring Boot via ActiveMQ"));
diff --git a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
index a207a06fe7..d2cf38097e 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindingPostProcessor.java
@@ -173,7 +173,8 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc
 
 	private boolean isJsr303Present() {
 		for (String validatorClass : VALIDATOR_CLASSES) {
-			if (!ClassUtils.isPresent(validatorClass, null)) {
+			if (!ClassUtils.isPresent(validatorClass,
+					this.applicationContext.getClassLoader())) {
 				return false;
 			}
 		}