diff --git a/spring-cloud-task-samples/single-step-batch-job/src/test/java/io/spring/BatchJobApplicationTests.java b/spring-cloud-task-samples/single-step-batch-job/src/test/java/io/spring/BatchJobApplicationTests.java
index 4389f114..80cb802b 100644
--- a/spring-cloud-task-samples/single-step-batch-job/src/test/java/io/spring/BatchJobApplicationTests.java
+++ b/spring-cloud-task-samples/single-step-batch-job/src/test/java/io/spring/BatchJobApplicationTests.java
@@ -86,8 +86,6 @@ public class BatchJobApplicationTests {
 		dataSource.setPassword(DATASOURCE_USER_PASSWORD);
 		JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
 		jdbcTemplate.execute("TRUNCATE TABLE item");
-		jdbcTemplate.execute("DROP TABLE IF EXISTS BATCH_JOB_EXECUTION CASCADE");
-		jdbcTemplate.execute("DROP TABLE IF EXISTS BATCH_JOB_INSTANCE CASCADE");
 	}
 
 	@Test
@@ -97,7 +95,8 @@ public class BatchJobApplicationTests {
 			"--spring.datasource.username=" + DATASOURCE_USER_NAME,
 			"--spring.datasource.url=" + DATASOURCE_URL,
 			"--spring.datasource.driver-class-name=" + DATASOURCE_DRIVER_CLASS_NAME,
-			"--spring.datasource.password=" + DATASOURCE_USER_PASSWORD);
+			"--spring.datasource.password=" + DATASOURCE_USER_PASSWORD,
+			"foo=testFileReaderJdbcWriter");
 		validateDBResult();
 	}
 
@@ -108,7 +107,8 @@ public class BatchJobApplicationTests {
 			"--spring.datasource.username=" + DATASOURCE_USER_NAME,
 			"--spring.datasource.url=" + DATASOURCE_URL,
 			"--spring.datasource.driver-class-name=" + DATASOURCE_DRIVER_CLASS_NAME,
-			"--spring.datasource.password=" + DATASOURCE_USER_PASSWORD);
+			"--spring.datasource.password=" + DATASOURCE_USER_PASSWORD,
+			"foo=testJdbcReaderJdbcWriter");
 		validateDBResult();
 	}
 
@@ -119,14 +119,16 @@ public class BatchJobApplicationTests {
 			"--spring.datasource.username=" + DATASOURCE_USER_NAME,
 			"--spring.datasource.url=" + DATASOURCE_URL,
 			"--spring.datasource.driver-class-name=" + DATASOURCE_DRIVER_CLASS_NAME,
-			"--spring.datasource.password=" + DATASOURCE_USER_PASSWORD);
+			"--spring.datasource.password=" + DATASOURCE_USER_PASSWORD,
+			"foo=testJdbcReaderFlatfileWriter");
 		validateFileResult();
 	}
 
 	@Test
 	public void testFileReaderFileWriter() throws Exception {
 		getSpringApplication().run(SingleStepBatchJobApplication.class,
-			"--spring.profiles.active=ffreader,ffwriter");
+			"--spring.profiles.active=ffreader,ffwriter",
+			"foo=testFileReaderFileWriter");
 		validateFileResult();
 	}
 
diff --git a/spring-cloud-task-samples/single-step-batch-job/src/test/resources/schema-h2.sql b/spring-cloud-task-samples/single-step-batch-job/src/test/resources/schema-h2.sql
index fe7f50f7..8b320841 100644
--- a/spring-cloud-task-samples/single-step-batch-job/src/test/resources/schema-h2.sql
+++ b/spring-cloud-task-samples/single-step-batch-job/src/test/resources/schema-h2.sql
@@ -14,3 +14,83 @@ INSERT INTO item_sample (item_name) VALUES ('baz');
 INSERT INTO item_sample (item_name) VALUES ('boo');
 INSERT INTO item_sample (item_name) VALUES ('qux');
 INSERT INTO item_sample (item_name) VALUES ('Job');
+
+CREATE TABLE BATCH_JOB_INSTANCE  (
+	JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
+	VERSION BIGINT ,
+	JOB_NAME VARCHAR(100) NOT NULL,
+	JOB_KEY VARCHAR(32) NOT NULL,
+	constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY)
+) ;
+
+CREATE TABLE BATCH_JOB_EXECUTION  (
+	JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY ,
+	VERSION BIGINT  ,
+	JOB_INSTANCE_ID BIGINT NOT NULL,
+	CREATE_TIME TIMESTAMP NOT NULL,
+	START_TIME TIMESTAMP DEFAULT NULL ,
+	END_TIME TIMESTAMP DEFAULT NULL ,
+	STATUS VARCHAR(10) ,
+	EXIT_CODE VARCHAR(2500) ,
+	EXIT_MESSAGE VARCHAR(2500) ,
+	LAST_UPDATED TIMESTAMP,
+	JOB_CONFIGURATION_LOCATION VARCHAR(2500) NULL,
+	constraint JOB_INST_EXEC_FK foreign key (JOB_INSTANCE_ID)
+	references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID)
+) ;
+
+CREATE TABLE BATCH_JOB_EXECUTION_PARAMS  (
+	JOB_EXECUTION_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 ,
+	IDENTIFYING CHAR(1) NOT NULL ,
+	constraint JOB_EXEC_PARAMS_FK foreign key (JOB_EXECUTION_ID)
+	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
+) ;
+
+CREATE TABLE BATCH_STEP_EXECUTION  (
+	STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL 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 ,
+	READ_COUNT BIGINT ,
+	FILTER_COUNT BIGINT ,
+	WRITE_COUNT BIGINT ,
+	READ_SKIP_COUNT BIGINT ,
+	WRITE_SKIP_COUNT BIGINT ,
+	PROCESS_SKIP_COUNT BIGINT ,
+	ROLLBACK_COUNT BIGINT ,
+	EXIT_CODE VARCHAR(2500) ,
+	EXIT_MESSAGE VARCHAR(2500) ,
+	LAST_UPDATED TIMESTAMP,
+	constraint JOB_EXEC_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 PRIMARY KEY,
+	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
+	SERIALIZED_CONTEXT LONGVARCHAR ,
+	constraint STEP_EXEC_CTX_FK foreign key (STEP_EXECUTION_ID)
+	references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID)
+) ;
+
+CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT  (
+	JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY,
+	SHORT_CONTEXT VARCHAR(2500) NOT NULL,
+	SERIALIZED_CONTEXT LONGVARCHAR ,
+	constraint JOB_EXEC_CTX_FK foreign key (JOB_EXECUTION_ID)
+	references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID)
+) ;
+
+CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ;
+CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ;
+CREATE SEQUENCE BATCH_JOB_SEQ;