diff --git a/build.gradle b/build.gradle
index 2ac98803a5..3856a4f9a8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -101,7 +101,7 @@ subprojects { subproject ->
 		hazelcastVersion = '3.6.1'
 		hibernateVersion = '5.1.0.Final'
 		hsqldbVersion = '2.3.3'
-		h2Version = '1.4.180'
+		h2Version = '1.4.197'
 		jackson2Version = '2.8.10'
 		javaxActivationVersion = '1.1.1'
 		javaxMailVersion = '1.5.6'
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java
index cd501cf23b..6481b3a445 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,6 +54,7 @@ import org.springframework.messaging.support.GenericMessage;
  * @author Gary Russell
  * @author Artem Bilan
  * @author Gunnar Hillert
+ *
  * @since 2.0
  *
  */
@@ -104,7 +105,7 @@ public class JdbcOutboundGatewayParserTests {
 		assertNotNull(reply);
 
 		Map<String, ?> payload = (Map<String, ?>) reply.getPayload();
-		Object id = payload.get("SCOPE_IDENTITY()");
+		Object id = payload.get("ID");
 		assertNotNull(id);
 
 		Map<String, Object> map = this.jdbcTemplate.queryForMap("SELECT * from BARS");
@@ -119,7 +120,7 @@ public class JdbcOutboundGatewayParserTests {
 		assertNotNull(reply);
 
 		payload = (Map<String, ?>) reply.getPayload();
-		id = payload.get("SCOPE_IDENTITY()");
+		id = payload.get("ID");
 		assertNotNull(id);
 		map = this.jdbcTemplate.queryForMap("SELECT * from BARS");
 		assertEquals("Wrong id", id, map.get("ID"));
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingKeyGenerationJdbcOutboundGatewayTest.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingKeyGenerationJdbcOutboundGatewayTest.xml
index b3f60c98f9..0efa5336a8 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingKeyGenerationJdbcOutboundGatewayTest.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/handlingKeyGenerationJdbcOutboundGatewayTest.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/integration/jdbc" xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:si="http://www.springframework.org/schema/integration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
-			http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
 			http://www.springframework.org/schema/integration
 			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/jdbc
 			http://www.springframework.org/schema/integration/jdbc/spring-integration-jdbc.xsd">
 
+	<beans:import resource="jdbcOutboundChannelAdapterCommonConfig.xml" />
+
 	<si:channel id="output">
 		<si:queue />
 	</si:channel>
@@ -27,6 +27,4 @@
 					  request-prepared-statement-setter="messagePreparedStatementSetter"
 					  keys-generated="true" />
 
-	<beans:import resource="jdbcOutboundChannelAdapterCommonConfig.xml" />
-
 </beans:beans>
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/outboundSchema.sql b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/outboundSchema.sql
index 19ff68a45d..2f6170d6f6 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/outboundSchema.sql
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/outboundSchema.sql
@@ -1,4 +1,4 @@
 drop table foos;
 drop table bars;
-create table foos(id varchar(100),status int,name varchar(20));
-create table bars(id int identity,status int,name varchar(20));
+create table foos(id varchar(100), status int, name varchar(20));
+create table bars(id int identity, status int, name varchar(20));