diff --git a/spring-integration-jdbc/build.gradle b/spring-integration-jdbc/build.gradle
index 124a1196f0..72cc936eef 100644
--- a/spring-integration-jdbc/build.gradle
+++ b/spring-integration-jdbc/build.gradle
@@ -14,7 +14,7 @@ task generateSql {
     configurations { vpp }
     dependencies { vpp 'foundrylogic.vpp:vpp:2.2.1' }
 
-    def generatedResourcesDir = new File(buildDir, 'generated-resources')
+    def generatedResourcesDir = new File('src/main/resources/org/springframework/integration/jdbc')
 
     outputs.dir generatedResourcesDir
 
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql
index faffeb2208..73c4add07e 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-mysql.sql
@@ -7,7 +7,7 @@ CREATE TABLE INT_MESSAGE  (
 	MESSAGE_BYTES BLOB
 ) ENGINE=InnoDB;
 
-CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE) ENGINE=InnoDB;
+CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
 	GROUP_KEY CHAR(36) NOT NULL,
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql
index 3c1d7c2193..3e7b728b5d 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sybase.sql
@@ -7,7 +7,7 @@ CREATE TABLE INT_MESSAGE  (
 	MESSAGE_BYTES IMAGE
 ) LOCK DATAROWS;
 
-CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE) LOCK DATAROWS;
+CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
 	GROUP_KEY CHAR(36) NOT NULL,
diff --git a/spring-integration-jdbc/src/main/sql/schema.sql.vpp b/spring-integration-jdbc/src/main/sql/schema.sql.vpp
index 9a0ebb7684..28cfc79e89 100644
--- a/spring-integration-jdbc/src/main/sql/schema.sql.vpp
+++ b/spring-integration-jdbc/src/main/sql/schema.sql.vpp
@@ -7,7 +7,7 @@ CREATE TABLE INT_MESSAGE  (
 	MESSAGE_BYTES ${BLOB}
 )#if(${VOODOO}) ${VOODOO}#end;
 
-CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE)#if(${VOODOO}) ${VOODOO}#end;
+CREATE INDEX INT_MESSAGE_IX1 ON INT_MESSAGE (CREATED_DATE);
 
 CREATE TABLE INT_GROUP_TO_MESSAGE  (
 	GROUP_KEY CHAR(36) NOT NULL,