diff --git a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleCommandLineJobRunner.java b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleCommandLineJobRunner.java
index 25300c5f5..4e3dbe651 100644
--- a/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleCommandLineJobRunner.java
+++ b/spring-batch-execution/src/main/java/org/springframework/batch/execution/bootstrap/support/SimpleCommandLineJobRunner.java
@@ -217,8 +217,7 @@ public class SimpleCommandLineJobRunner {
 					AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, false);
 
 			Assert.state(launcher != null, "JobLauncher must be provided in the parent ApplicationContext"
-					+ ", check the context created within classpath*:beanRefContext.xml to ensure a JobLauncher"
-					+ " is declared");
+					+ ", check the context to ensure a JobLauncher is declared");
 
 			if (jobName == null) {
 				String[] names = context.getBeanNamesForType(Job.class);
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment-with-job.xml b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment-with-job.xml
index ecaa727ea..a0373d85b 100644
--- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment-with-job.xml
+++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/bootstrap/support/test-batch-environment-with-job.xml
@@ -14,7 +14,7 @@
 	<bean class="org.springframework.batch.execution.bootstrap.support.SimpleJvmExitCodeMapper" />
 
 	<bean
-		class="org.springframework.batch.execution.bootstrap.support.BatchCommandLineLauncherTests$StubSystemExiter" />
+		class="org.springframework.batch.execution.bootstrap.support.SimpleCommandLineJobRunnerTests$StubSystemExiter" />
 
 	<bean id="test-job" class="org.springframework.batch.core.domain.Job">
 		<property name="steps">