diff --git a/spring-batch-core/src/main/resources/batch.template.properties b/spring-batch-core/src/main/resources/batch.template.properties
deleted file mode 100644
index b24969b96..000000000
--- a/spring-batch-core/src/main/resources/batch.template.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-batch.jdbc.driver=
-batch.jdbc.url=
-batch.jdbc.user=
-batch.jdbc.password=
-batch.schema=
-batch.jndi.name=
-batch.naming.factory.initial=
-batch.naming.provider.url=
-batch.database.vendor=
\ No newline at end of file
diff --git a/spring-batch-core/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java b/spring-batch-core/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
index ff6b0bc9a..b5e410af7 100644
--- a/spring-batch-core/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
+++ b/spring-batch-core/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
@@ -137,10 +137,6 @@ public class InitializingDataSourceFactoryBean extends AbstractFactoryBean {
 		return DataSource.class;
 	}
 
-	public void setInitScript(Resource initScript) {
-		this.initScripts = new Resource[] { initScript };
-	}
-
 	public void setInitScripts(Resource[] initScripts) {
 		this.initScripts = initScripts;
 	}
diff --git a/spring-batch-core/src/test/resources/data-source-context.xml b/spring-batch-core/src/test/resources/data-source-context.xml
index a3fc06736..1ce83296d 100644
--- a/spring-batch-core/src/test/resources/data-source-context.xml
+++ b/spring-batch-core/src/test/resources/data-source-context.xml
@@ -1,41 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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-2.0.xsd">
-
 	<bean id="dataSource" class="test.jdbc.datasource.InitializingDataSourceFactoryBean">
 		<property name="dataSource">
 			<bean class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-				<property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
-				<property name="url" value="jdbc:hsqldb:mem:testdb;sql.enforce_strict_size=true"/>
+				<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
+				<property name="url" value="jdbc:hsqldb:mem:testdb;sql.enforce_strict_size=true" />
 			</bean>
 		</property>
-		<property name="initScript" value="init.sql" />
+		<property name="initScripts">
+			<list>
+				<value>init.sql</value>
+				<value>foo.sql</value>
+			</list>
+		</property>
 		<property name="destroyScript" value="destroy.sql" />
 	</bean>
-
 	<bean id="transactionManager" class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
-
-	<bean id="incrementerParent" class="org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer" abstract="true">
+	<bean id="incrementerParent" class="org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer"
+		abstract="true">
 		<property name="dataSource" ref="dataSource" />
 		<property name="columnName" value="ID" />
 	</bean>
-
 	<bean id="jobIncrementer" parent="incrementerParent">
 		<property name="incrementerName" value="BATCH_JOB_SEQ" />
 	</bean>
-
 	<bean id="jobExecutionIncrementer" parent="incrementerParent">
 		<property name="incrementerName" value="BATCH_JOB_EXECUTION_SEQ" />
 	</bean>
-
 	<bean id="stepIncrementer" parent="incrementerParent">
 		<property name="incrementerName" value="BATCH_STEP_SEQ" />
 	</bean>
-
 	<bean id="stepExecutionIncrementer" parent="incrementerParent">
 		<property name="incrementerName" value="BATCH_STEP_EXECUTION_SEQ" />
 	</bean>
-
 </beans>
\ No newline at end of file
diff --git a/spring-batch-core/src/test/resources/destroy.sql b/spring-batch-core/src/test/resources/destroy.sql
index bbdb2a8d6..461b9682d 100644
--- a/spring-batch-core/src/test/resources/destroy.sql
+++ b/spring-batch-core/src/test/resources/destroy.sql
@@ -4,7 +4,6 @@ DROP TABLE  BATCH_STEP_EXECUTION IF EXISTS;
 DROP TABLE  BATCH_JOB_EXECUTION IF EXISTS;
 DROP TABLE  BATCH_JOB_PARAMS IF EXISTS;
 DROP TABLE  BATCH_JOB_INSTANCE IF EXISTS;
-DROP TABLE T_FOOS;
 
 DROP TABLE  BATCH_STEP_EXECUTION_SEQ IF EXISTS;
 DROP TABLE  BATCH_JOB_EXECUTION_SEQ IF EXISTS;
diff --git a/spring-batch-core/src/test/resources/foo.sql b/spring-batch-core/src/test/resources/foo.sql
new file mode 100644
index 000000000..0b8adebe0
--- /dev/null
+++ b/spring-batch-core/src/test/resources/foo.sql
@@ -0,0 +1,73 @@
+-- Autogenerated: do not edit this file
+CREATE TABLE BATCH_JOB_INSTANCE  (
+	JOB_INSTANCE_ID BIGINT IDENTITY PRIMARY KEY ,  
+	VERSION BIGINT,  
+	JOB_NAME VARCHAR(100) NOT NULL , 
+	JOB_KEY VARCHAR(2500)
+) ;
+
+CREATE TABLE BATCH_JOB_EXECUTION  (
+	JOB_EXECUTION_ID BIGINT IDENTITY PRIMARY KEY ,
+	VERSION BIGINT,  
+	JOB_INSTANCE_ID BIGINT NOT NULL,
+	START_TIME TIMESTAMP DEFAULT NULL, 
+	END_TIME TIMESTAMP DEFAULT NULL,
+	STATUS VARCHAR(10),
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_JOB_PARAMS  (
+	JOB_INSTANCE_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(100) NOT NULL , 
+	STRING_VAL VARCHAR(250) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL,
+	LONG_VAL BIGINT ,
+	DOUBLE_VAL DOUBLE PRECISION,
+	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION  (
+	STEP_EXECUTION_ID BIGINT IDENTITY PRIMARY KEY ,
+	VERSION BIGINT NOT NULL,  
+	STEP_NAME VARCHAR(100) NOT NULL,
+	JOB_EXECUTION_ID BIGINT NOT NULL,
+	START_TIME TIMESTAMP NOT NULL , 
+	END_TIME TIMESTAMP DEFAULT NULL,  
+	STATUS VARCHAR(10),
+	COMMIT_COUNT BIGINT , 
+	ITEM_COUNT BIGINT , 
+	CONTINUABLE CHAR(1),
+	EXIT_CODE VARCHAR(20),
+	EXIT_MESSAGE VARCHAR(2500),
+	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
+	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
+) ;
+	
+CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
+	STEP_EXECUTION_ID BIGINT NOT NULL ,
+    TYPE_CD VARCHAR(6) NOT NULL ,
+	KEY_NAME VARCHAR(1000) NOT NULL , 
+	STRING_VAL VARCHAR(1000) , 
+	DATE_VAL TIMESTAMP DEFAULT NULL ,
+	LONG_VAL VARCHAR(10) ,
+	DOUBLE_VAL DOUBLE PRECISION ,
+    OBJECT_VAL LONGVARBINARY,
+	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
+	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
+) ;
+
+CREATE TABLE BATCH_STEP_EXECUTION_SEQ (
+	ID BIGINT IDENTITY
+);
+CREATE TABLE BATCH_JOB_EXECUTION_SEQ (
+	ID BIGINT IDENTITY
+);
+CREATE TABLE BATCH_JOB_SEQ (
+	ID BIGINT IDENTITY
+);
diff --git a/spring-batch-core/src/test/resources/init.sql b/spring-batch-core/src/test/resources/init.sql
index 129475606..6e565a286 100644
--- a/spring-batch-core/src/test/resources/init.sql
+++ b/spring-batch-core/src/test/resources/init.sql
@@ -1,77 +1,3 @@
--- Autogenerated: do not edit this file
-CREATE TABLE BATCH_JOB_INSTANCE  (
-	JOB_INSTANCE_ID BIGINT IDENTITY PRIMARY KEY ,  
-	VERSION BIGINT,  
-	JOB_NAME VARCHAR(100) NOT NULL , 
-	JOB_KEY VARCHAR(2500)
-) ;
-
-CREATE TABLE BATCH_JOB_EXECUTION  (
-	JOB_EXECUTION_ID BIGINT IDENTITY PRIMARY KEY ,
-	VERSION BIGINT,  
-	JOB_INSTANCE_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP NULL, 
-	END_TIME TIMESTAMP NULL,
-	STATUS VARCHAR(10),
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_INSTANCE_EXECUTION_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_JOB_PARAMS  (
-	JOB_INSTANCE_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(100) NOT NULL , 
-	STRING_VAL VARCHAR(250) , 
-	DATE_VAL TIMESTAMP NULL,
-	LONG_VAL BIGINT ,
-	DOUBLE_VAL DOUBLE PRECISION,
-	constraint JOB_INSTANCE_PARAMS_FK foreign key (JOB_INSTANCE_ID)
-	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION  (
-	STEP_EXECUTION_ID BIGINT IDENTITY PRIMARY KEY ,
-	VERSION BIGINT NOT NULL,  
-	STEP_NAME VARCHAR(100) NOT NULL,
-	JOB_EXECUTION_ID BIGINT NOT NULL,
-	START_TIME TIMESTAMP NOT NULL , 
-	END_TIME TIMESTAMP NULL,  
-	STATUS VARCHAR(10),
-	COMMIT_COUNT BIGINT , 
-	ITEM_COUNT BIGINT , 
-	CONTINUABLE CHAR(1),
-	EXIT_CODE VARCHAR(20),
-	EXIT_MESSAGE VARCHAR(2500),
-	constraint JOB_EXECUTION_STEP_FK foreign key (JOB_EXECUTION_ID)
-	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
-) ;
-	
-CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT  (
-	STEP_EXECUTION_ID BIGINT NOT NULL ,
-    TYPE_CD VARCHAR(6) NOT NULL ,
-	KEY_NAME VARCHAR(1000) NOT NULL , 
-	STRING_VAL VARCHAR(1000) , 
-	DATE_VAL TIMESTAMP ,
-	LONG_VAL VARCHAR(10) ,
-	DOUBLE_VAL DOUBLE PRECISION ,
-    OBJECT_VAL LONGVARBINARY,
-	constraint STEP_EXECUTION_CONTEXT_FK foreign key (STEP_EXECUTION_ID)
-	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
-) ;
-
-CREATE TABLE BATCH_STEP_EXECUTION_SEQ (
-	ID BIGINT IDENTITY
-);
-CREATE TABLE BATCH_JOB_EXECUTION_SEQ (
-	ID BIGINT IDENTITY
-);
-CREATE TABLE BATCH_JOB_SEQ (
-	ID BIGINT IDENTITY
-);
-
 CREATE TABLE T_FOOS (
 	ID BIGINT NOT NULL,
 	NAME VARCHAR(45),