diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/DataSourceInitializer.java b/spring-batch-test/src/main/java/org/springframework/batch/test/DataSourceInitializer.java
index 2659cb66a..27138b43c 100755
--- a/spring-batch-test/src/main/java/org/springframework/batch/test/DataSourceInitializer.java
+++ b/spring-batch-test/src/main/java/org/springframework/batch/test/DataSourceInitializer.java
@@ -64,7 +64,7 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean {
 
 	private boolean ignoreFailedDrop = true;
 
-	private static boolean initialized = false;
+	private boolean initialized = false;
 
 	/**
 	 * Main method as convenient entry point.
diff --git a/spring-batch-test/src/test/resources/batch-hsql.properties b/spring-batch-test/src/test/resources/batch-hsql.properties
index 9b85b094f..16fad3d5b 100755
--- a/spring-batch-test/src/test/resources/batch-hsql.properties
+++ b/spring-batch-test/src/test/resources/batch-hsql.properties
@@ -11,6 +11,7 @@ batch.schema=
 batch.jndi.name=
 batch.naming.factory.initial=
 batch.naming.provider.url=
+batch.drop.script=org/springframework/batch/core/schema-drop-hsqldb.sql
 batch.schema.script=org/springframework/batch/core/schema-hsqldb.sql
 batch.business.schema.script=business-schema-hsqldb.sql
 batch.database.incrementer.class=org.springframework.jdbc.support.incrementer.HsqlMaxValueIncrementer
diff --git a/spring-batch-test/src/test/resources/data-source-context.xml b/spring-batch-test/src/test/resources/data-source-context.xml
index 071bc91c5..4de87296d 100755
--- a/spring-batch-test/src/test/resources/data-source-context.xml
+++ b/spring-batch-test/src/test/resources/data-source-context.xml
@@ -9,6 +9,7 @@
 		<property name="dataSource" ref="dataSource" />
 		<property name="initScripts">
 			<list>
+				<value>${batch.drop.script}</value>
 				<value>${batch.schema.script}</value>
 				<value>${batch.business.schema.script}
 				</value>