diff --git a/spring-batch-execution/src/main/resources/schema-db2.sql b/spring-batch-execution/src/main/resources/schema-db2.sql
index 3d72403f8..a68e2f2db 100644
--- a/spring-batch-execution/src/main/resources/schema-db2.sql
+++ b/spring-batch-execution/src/main/resources/schema-db2.sql
@@ -1,9 +1,9 @@
 -- Autogenerated: do not edit this file
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
 DROP TABLE  BATCH_STEP_EXECUTION ;
 DROP TABLE  BATCH_JOB_EXECUTION ;
-DROP TABLE  BATCH_JOB_INSTANCE ;
 DROP TABLE  BATCH_JOB_PARAMS ;
-DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
+DROP TABLE  BATCH_JOB_INSTANCE ;
 
 DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_JOB_EXECUTION_SEQ ;
diff --git a/spring-batch-execution/src/main/resources/schema-derby.sql b/spring-batch-execution/src/main/resources/schema-derby.sql
index 21fbc5a70..4c71a606e 100644
--- a/spring-batch-execution/src/main/resources/schema-derby.sql
+++ b/spring-batch-execution/src/main/resources/schema-derby.sql
@@ -1,9 +1,9 @@
 -- Autogenerated: do not edit this file
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
 DROP TABLE  BATCH_STEP_EXECUTION ;
 DROP TABLE  BATCH_JOB_EXECUTION ;
-DROP TABLE  BATCH_JOB_INSTANCE ;
 DROP TABLE  BATCH_JOB_PARAMS ;
-DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
+DROP TABLE  BATCH_JOB_INSTANCE ;
 
 DROP TABLE  BATCH_STEP_EXECUTION_SEQ ;
 DROP TABLE  BATCH_JOB_EXECUTION_SEQ ;
diff --git a/spring-batch-execution/src/main/resources/schema-hsqldb.sql b/spring-batch-execution/src/main/resources/schema-hsqldb.sql
index d9cf59194..c0463a21f 100644
--- a/spring-batch-execution/src/main/resources/schema-hsqldb.sql
+++ b/spring-batch-execution/src/main/resources/schema-hsqldb.sql
@@ -1,9 +1,9 @@
 -- Autogenerated: do not edit this file
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT IF EXISTS;
 DROP TABLE  BATCH_STEP_EXECUTION IF EXISTS;
 DROP TABLE  BATCH_JOB_EXECUTION IF EXISTS;
-DROP TABLE  BATCH_JOB_INSTANCE IF EXISTS;
 DROP TABLE  BATCH_JOB_PARAMS IF EXISTS;
-DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT IF EXISTS;
+DROP TABLE  BATCH_JOB_INSTANCE IF EXISTS;
 
 DROP TABLE  BATCH_STEP_EXECUTION_SEQ IF EXISTS;
 DROP TABLE  BATCH_JOB_EXECUTION_SEQ IF EXISTS;
diff --git a/spring-batch-execution/src/main/resources/schema-mysql.sql b/spring-batch-execution/src/main/resources/schema-mysql.sql
index 67f164c68..72bce88d8 100644
--- a/spring-batch-execution/src/main/resources/schema-mysql.sql
+++ b/spring-batch-execution/src/main/resources/schema-mysql.sql
@@ -1,9 +1,9 @@
 -- Autogenerated: do not edit this file
+DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT ;
 DROP TABLE IF EXISTS BATCH_STEP_EXECUTION ;
 DROP TABLE IF EXISTS BATCH_JOB_EXECUTION ;
-DROP TABLE IF EXISTS BATCH_JOB_INSTANCE ;
 DROP TABLE IF EXISTS BATCH_JOB_PARAMS ;
-DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_CONTEXT ;
+DROP TABLE IF EXISTS BATCH_JOB_INSTANCE ;
 
 DROP TABLE IF EXISTS BATCH_STEP_EXECUTION_SEQ ;
 DROP TABLE IF EXISTS BATCH_JOB_EXECUTION_SEQ ;
diff --git a/spring-batch-execution/src/main/resources/schema-oracle10g.sql b/spring-batch-execution/src/main/resources/schema-oracle10g.sql
index 5592228d8..f4ba316f9 100644
--- a/spring-batch-execution/src/main/resources/schema-oracle10g.sql
+++ b/spring-batch-execution/src/main/resources/schema-oracle10g.sql
@@ -1,9 +1,9 @@
 -- Autogenerated: do not edit this file
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
 DROP TABLE  BATCH_STEP_EXECUTION ;
 DROP TABLE  BATCH_JOB_EXECUTION ;
-DROP TABLE  BATCH_JOB_INSTANCE ;
 DROP TABLE  BATCH_JOB_PARAMS ;
-DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
+DROP TABLE  BATCH_JOB_INSTANCE ;
 
 DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_JOB_EXECUTION_SEQ ;
diff --git a/spring-batch-execution/src/main/resources/schema-postgresql.sql b/spring-batch-execution/src/main/resources/schema-postgresql.sql
index 3d72403f8..a68e2f2db 100644
--- a/spring-batch-execution/src/main/resources/schema-postgresql.sql
+++ b/spring-batch-execution/src/main/resources/schema-postgresql.sql
@@ -1,9 +1,9 @@
 -- Autogenerated: do not edit this file
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
 DROP TABLE  BATCH_STEP_EXECUTION ;
 DROP TABLE  BATCH_JOB_EXECUTION ;
-DROP TABLE  BATCH_JOB_INSTANCE ;
 DROP TABLE  BATCH_JOB_PARAMS ;
-DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT ;
+DROP TABLE  BATCH_JOB_INSTANCE ;
 
 DROP SEQUENCE  BATCH_STEP_EXECUTION_SEQ ;
 DROP SEQUENCE  BATCH_JOB_EXECUTION_SEQ ;
diff --git a/spring-batch-execution/src/main/sql/destroy.sql.vpp b/spring-batch-execution/src/main/sql/destroy.sql.vpp
index 3873da951..a256480e4 100644
--- a/spring-batch-execution/src/main/sql/destroy.sql.vpp
+++ b/spring-batch-execution/src/main/sql/destroy.sql.vpp
@@ -1,9 +1,9 @@
 -- Autogenerated: do not edit this file
+DROP TABLE $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION_CONTEXT $!{IFEXISTS};
 DROP TABLE $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION $!{IFEXISTS};
 DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_EXECUTION $!{IFEXISTS};
-DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_INSTANCE $!{IFEXISTS};
 DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_PARAMS $!{IFEXISTS};
-DROP TABLE $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION_CONTEXT $!{IFEXISTS};
+DROP TABLE $!{IFEXISTSBEFORE} BATCH_JOB_INSTANCE $!{IFEXISTS};
 
 DROP ${SEQUENCE} $!{IFEXISTSBEFORE} BATCH_STEP_EXECUTION_SEQ $!{IFEXISTS};
 DROP ${SEQUENCE} $!{IFEXISTSBEFORE} BATCH_JOB_EXECUTION_SEQ $!{IFEXISTS};
diff --git a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql
index 489809f9b..461b9682d 100644
--- a/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql
+++ b/spring-batch-execution/src/test/resources/org/springframework/batch/execution/repository/dao/destroy.sql
@@ -1,9 +1,9 @@
 -- Autogenerated: do not edit this file
+DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT IF EXISTS;
 DROP TABLE  BATCH_STEP_EXECUTION IF EXISTS;
 DROP TABLE  BATCH_JOB_EXECUTION IF EXISTS;
-DROP TABLE  BATCH_JOB_INSTANCE IF EXISTS;
 DROP TABLE  BATCH_JOB_PARAMS IF EXISTS;
-DROP TABLE  BATCH_STEP_EXECUTION_CONTEXT IF EXISTS;
+DROP TABLE  BATCH_JOB_INSTANCE IF EXISTS;
 
 DROP TABLE  BATCH_STEP_EXECUTION_SEQ IF EXISTS;
 DROP TABLE  BATCH_JOB_EXECUTION_SEQ IF EXISTS;