diff --git a/camel-workitem/src/test/java/org/jbpm/process/workitem/camel/CamelSqlTest.java b/camel-workitem/src/test/java/org/jbpm/process/workitem/camel/CamelSqlTest.java
index 778a6c610..2033d4e32 100644
--- a/camel-workitem/src/test/java/org/jbpm/process/workitem/camel/CamelSqlTest.java
+++ b/camel-workitem/src/test/java/org/jbpm/process/workitem/camel/CamelSqlTest.java
@@ -85,7 +85,7 @@ public void cleanup() {
*/
private static void setupDb() throws SQLException, URISyntaxException {
File script = new File(CamelSqlTest.class.getResource("/init-db.sql").toURI());
- RunScript.execute("jdbc:h2:mem:jbpm-db;MVCC=true",
+ RunScript.execute("jdbc:h2:mem:jbpm-db;MODE=LEGACY;NON_KEYWORDS=VALUE",
"sa",
"",
script.getAbsolutePath(),
diff --git a/execute-sql-workitem/src/test/java/org/jbpm/process/workitem/executesql/ExecuteSqlWorkItemHandlerTest.java b/execute-sql-workitem/src/test/java/org/jbpm/process/workitem/executesql/ExecuteSqlWorkItemHandlerTest.java
index d604c7b5f..a1d6120c2 100644
--- a/execute-sql-workitem/src/test/java/org/jbpm/process/workitem/executesql/ExecuteSqlWorkItemHandlerTest.java
+++ b/execute-sql-workitem/src/test/java/org/jbpm/process/workitem/executesql/ExecuteSqlWorkItemHandlerTest.java
@@ -169,7 +169,7 @@ private static PoolingDataSourceWrapper setupPoolingDataSource() throws Exceptio
driverProperties.setProperty("password",
"sa");
driverProperties.setProperty("url",
- "jdbc:h2:mem:jpa-wih;MVCC=true");
+ "jdbc:h2:mem:jpa-wih;MODE=LEGACY;NON_KEYWORDS=VALUE");
driverProperties.setProperty("driverClassName",
"org.h2.Driver");
@@ -185,7 +185,7 @@ private static class TestH2Server {
public void start() {
if (realH2Server == null || !realH2Server.isRunning(false)) {
try {
- realH2Server = Server.createTcpServer(new String[0]);
+ realH2Server = Server.createTcpServer(new String[]{"-ifNotExists"});
realH2Server.start();
System.out.println("Started H2 Server...");
} catch (SQLException e) {
diff --git a/jpa-workitem/src/test/java/org/jbpm/process/workitem/jpa/JPAWorkItemHandlerTest.java b/jpa-workitem/src/test/java/org/jbpm/process/workitem/jpa/JPAWorkItemHandlerTest.java
index 10057c2e0..0cfe125ad 100644
--- a/jpa-workitem/src/test/java/org/jbpm/process/workitem/jpa/JPAWorkItemHandlerTest.java
+++ b/jpa-workitem/src/test/java/org/jbpm/process/workitem/jpa/JPAWorkItemHandlerTest.java
@@ -356,7 +356,7 @@ public static PoolingDataSourceWrapper setupPoolingDataSource() {
driverProperties.setProperty("password",
"sa");
driverProperties.setProperty("url",
- "jdbc:h2:mem:jpa-wih;MVCC=true");
+ "jdbc:h2:mem:jpa-wih;MODE=LEGACY;NON_KEYWORDS=VALUE");
driverProperties.setProperty("driverClassName",
"org.h2.Driver");
@@ -373,7 +373,7 @@ private static class TestH2Server {
public void start() {
if (realH2Server == null || !realH2Server.isRunning(false)) {
try {
- realH2Server = Server.createTcpServer(new String[0]);
+ realH2Server = Server.createTcpServer(new String[]{"-ifNotExists"});
realH2Server.start();
System.out.println("Started H2 Server...");
} catch (SQLException e) {
diff --git a/pom.xml b/pom.xml
index bd9b3b35b..2e55934ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
sa
sasa
- jdbc:h2:tcp://localhost/${project.basedir}/target/jbpm-test;MVCC=TRUE
+ jdbc:h2:tcp://localhost/${project.basedir}/target/jbpm-test;MODE=LEGACY;NON_KEYWORDS=VALUE
public