diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql
index fea32a78e3..9d3188ff62 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql
@@ -1,15 +1,15 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID VARCHAR(100) NOT NULL PRIMARY KEY,
+	MESSAGE_ID CHAR(36) NOT NULL PRIMARY KEY,
 	REGION VARCHAR(100),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BLOB
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	MESSAGE_ID VARCHAR(100) NOT NULL,
-	GROUP_KEY VARCHAR(100) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	GROUP_KEY CHAR(36) NOT NULL,
 	REGION VARCHAR(100),
 	MARKED BIGINT,
 	CREATED_DATE TIMESTAMP NOT NULL,
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql
index fea32a78e3..9d3188ff62 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql
@@ -1,15 +1,15 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID VARCHAR(100) NOT NULL PRIMARY KEY,
+	MESSAGE_ID CHAR(36) NOT NULL PRIMARY KEY,
 	REGION VARCHAR(100),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BLOB
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	MESSAGE_ID VARCHAR(100) NOT NULL,
-	GROUP_KEY VARCHAR(100) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	GROUP_KEY CHAR(36) NOT NULL,
 	REGION VARCHAR(100),
 	MARKED BIGINT,
 	CREATED_DATE TIMESTAMP NOT NULL,
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql
index 42c89ff068..1ce0f26631 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-h2.sql
@@ -1,15 +1,15 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID VARCHAR(100) NOT NULL PRIMARY KEY,
+	MESSAGE_ID CHAR(36) NOT NULL PRIMARY KEY,
 	REGION VARCHAR(100),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES LONGVARBINARY
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	MESSAGE_ID VARCHAR(100) NOT NULL,
-	GROUP_KEY VARCHAR(100) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	GROUP_KEY CHAR(36) NOT NULL,
 	REGION VARCHAR(100),
 	MARKED BIGINT,
 	CREATED_DATE TIMESTAMP NOT NULL,
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql
index 42c89ff068..1ce0f26631 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-hsqldb.sql
@@ -1,15 +1,15 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID VARCHAR(100) NOT NULL PRIMARY KEY,
+	MESSAGE_ID CHAR(36) NOT NULL PRIMARY KEY,
 	REGION VARCHAR(100),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES LONGVARBINARY
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	MESSAGE_ID VARCHAR(100) NOT NULL,
-	GROUP_KEY VARCHAR(100) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	GROUP_KEY CHAR(36) NOT NULL,
 	REGION VARCHAR(100),
 	MARKED BIGINT,
 	CREATED_DATE TIMESTAMP NOT NULL,
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 1f751b690c..7dc583c223 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
@@ -1,15 +1,15 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID VARCHAR(100) NOT NULL PRIMARY KEY,
+	MESSAGE_ID CHAR(36) NOT NULL PRIMARY KEY,
 	REGION VARCHAR(100),
 	CREATED_DATE DATETIME NOT NULL,
 	MESSAGE_BYTES BLOB
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	MESSAGE_ID VARCHAR(100) NOT NULL,
-	GROUP_KEY VARCHAR(100) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	GROUP_KEY CHAR(36) NOT NULL,
 	REGION VARCHAR(100),
 	MARKED BIGINT,
 	CREATED_DATE DATETIME NOT NULL,
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle10g.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle10g.sql
index 882d0ec9fb..cb1b32d419 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle10g.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-oracle10g.sql
@@ -1,15 +1,15 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID VARCHAR2(100) NOT NULL PRIMARY KEY,
+	MESSAGE_ID CHAR(36) NOT NULL PRIMARY KEY,
 	REGION VARCHAR2(100),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BLOB
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	MESSAGE_ID VARCHAR2(100) NOT NULL,
-	GROUP_KEY VARCHAR2(100) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	GROUP_KEY CHAR(36) NOT NULL,
 	REGION VARCHAR2(100),
 	MARKED NUMBER(19,0),
 	CREATED_DATE TIMESTAMP NOT NULL,
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql
index da2a30b079..c11fe43b19 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-postgresql.sql
@@ -1,15 +1,15 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID VARCHAR(100) NOT NULL PRIMARY KEY,
+	MESSAGE_ID CHAR(36) NOT NULL PRIMARY KEY,
 	REGION VARCHAR(100),
 	CREATED_DATE TIMESTAMP NOT NULL,
 	MESSAGE_BYTES BYTEA
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	MESSAGE_ID VARCHAR(100) NOT NULL,
-	GROUP_KEY VARCHAR(100) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	GROUP_KEY CHAR(36) NOT NULL,
 	REGION VARCHAR(100),
 	MARKED BIGINT,
 	CREATED_DATE TIMESTAMP NOT NULL,
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql
index 6019a98e1d..c921ebb6c7 100644
--- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql
+++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-sqlserver.sql
@@ -1,15 +1,15 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID VARCHAR(100) NOT NULL PRIMARY KEY,
+	MESSAGE_ID CHAR(36) NOT NULL PRIMARY KEY,
 	REGION VARCHAR(100),
 	CREATED_DATE DATETIME NOT NULL,
 	MESSAGE_BYTES IMAGE
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	MESSAGE_ID VARCHAR(100) NOT NULL,
-	GROUP_KEY VARCHAR(100) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	GROUP_KEY CHAR(36) NOT NULL,
 	REGION VARCHAR(100),
 	MARKED BIGINT,
 	CREATED_DATE DATETIME 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 6019a98e1d..c921ebb6c7 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
@@ -1,15 +1,15 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID VARCHAR(100) NOT NULL PRIMARY KEY,
+	MESSAGE_ID CHAR(36) NOT NULL PRIMARY KEY,
 	REGION VARCHAR(100),
 	CREATED_DATE DATETIME NOT NULL,
 	MESSAGE_BYTES IMAGE
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	MESSAGE_ID VARCHAR(100) NOT NULL,
-	GROUP_KEY VARCHAR(100) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	GROUP_KEY CHAR(36) NOT NULL,
 	REGION VARCHAR(100),
 	MARKED BIGINT,
 	CREATED_DATE DATETIME 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 1e90a62b10..4b53880097 100644
--- a/spring-integration-jdbc/src/main/sql/schema.sql.vpp
+++ b/spring-integration-jdbc/src/main/sql/schema.sql.vpp
@@ -1,15 +1,15 @@
 -- Autogenerated: do not edit this file
 
 CREATE TABLE INT_MESSAGE  (
-	MESSAGE_ID ${VARCHAR}(100) NOT NULL PRIMARY KEY,
+	MESSAGE_ID CHAR(36) NOT NULL PRIMARY KEY,
 	REGION ${VARCHAR}(100),
 	CREATED_DATE ${TIMESTAMP} NOT NULL,
 	MESSAGE_BYTES ${BLOB}
 );
 
 CREATE TABLE INT_MESSAGE_GROUP  (
-	MESSAGE_ID ${VARCHAR}(100) NOT NULL,
-	GROUP_KEY ${VARCHAR}(100) NOT NULL,
+	MESSAGE_ID CHAR(36) NOT NULL,
+	GROUP_KEY CHAR(36) NOT NULL,
 	REGION ${VARCHAR}(100),
 	MARKED ${BIGINT},
 	CREATED_DATE ${TIMESTAMP} NOT NULL,
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/messageHandlerIntegrationTest.sql b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/messageHandlerIntegrationTest.sql
similarity index 100%
rename from spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/messageHandlerIntegrationTest.sql
rename to spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/messageHandlerIntegrationTest.sql
diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/pollingChannelAdapterIntegrationTest.sql b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/pollingChannelAdapterIntegrationTest.sql
similarity index 100%
rename from spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/pollingChannelAdapterIntegrationTest.sql
rename to spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/pollingChannelAdapterIntegrationTest.sql