diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletParserBeanPropertiesTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletParserBeanPropertiesTests.java
new file mode 100644
index 000000000..cef65aec5
--- /dev/null
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TaskletParserBeanPropertiesTests.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2006-2007 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.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.configuration.xml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.batch.core.BatchStatus;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.Step;
+import org.springframework.batch.core.job.flow.FlowJob;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+
+/**
+ * @author Dave Syer
+ *
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class TaskletParserBeanPropertiesTests {
+	
+	@Autowired
+	@Qualifier("job1")
+	private Job job1;
+
+	@Autowired
+	@Qualifier("job2")
+	private FlowJob job2;
+
+	@Autowired
+	@Qualifier("tasklet")
+	private TestTasklet tasklet;
+
+	@Autowired
+	private JobRepository jobRepository;
+
+	@Autowired
+	private MapJobRepositoryFactoryBean mapJobRepositoryFactoryBean;
+	
+	@Before
+	public void setUp() {
+		mapJobRepositoryFactoryBean.clear();
+	}
+
+	@Test
+	public void testTaskletRef() throws Exception {
+		assertNotNull(job1);
+		JobExecution jobExecution = jobRepository.createJobExecution(job1.getName(), new JobParameters());
+		job1.execute(jobExecution);
+		assertEquals("bar", tasklet.getName());
+		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
+	}
+
+	@Test
+	public void testTaskletInline() throws Exception {
+		assertNotNull(job2);
+		JobExecution jobExecution = jobRepository.createJobExecution(job2.getName(), new JobParameters());
+		job2.execute(jobExecution);
+		Step step = job2.getStep("step2");
+		tasklet = (TestTasklet) ReflectionTestUtils.getField(step, "tasklet");
+		assertEquals("bar", tasklet.getName());
+		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
+	}
+}
diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/TaskletParserBeanPropertiesTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/TaskletParserBeanPropertiesTests-context.xml
new file mode 100644
index 000000000..5d0737c7a
--- /dev/null
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/TaskletParserBeanPropertiesTests-context.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/batch"
+	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd">
+
+	<job id="job1">
+		<step id="step1">
+			<tasklet ref="tasklet"/>
+		</step>
+	</job>
+
+	<job id="job2">
+		<step id="step2">
+			<tasklet>
+				<beans:bean class="org.springframework.batch.core.configuration.xml.TestTasklet" p:name="foo"/>
+			</tasklet>
+		</step>
+	</job>
+
+	<beans:bean id="tasklet" class="org.springframework.batch.core.configuration.xml.TestTasklet" p:name="bar"/>
+
+	<beans:bean id="transactionManager" class="org.springframework.batch.support.transaction.ResourcelessTransactionManager" />
+
+	<beans:bean id="jobRepository" class="org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean">
+		<beans:property name="transactionManager" ref="transactionManager" />
+	</beans:bean>
+
+</beans:beans>
\ No newline at end of file