diff --git a/kie-aries-blueprint/src/test/resources/org/kie/aries/blueprint/environment.xml b/kie-aries-blueprint/src/test/resources/org/kie/aries/blueprint/environment.xml
index 5ca656623c..5feb5def43 100644
--- a/kie-aries-blueprint/src/test/resources/org/kie/aries/blueprint/environment.xml
+++ b/kie-aries-blueprint/src/test/resources/org/kie/aries/blueprint/environment.xml
@@ -10,7 +10,7 @@
 
   <bean id="ds" class="org.kie.aries.blueprint.mocks.MockDataSource">
     <property name="driverClassName" value="org.h2.Driver"/>
-    <property name="url" value="jdbc:h2:tcp://localhost/DroolsFlow"/>
+    <property name="url" value="jdbc:h2:tcp://localhost/DroolsFlow;MODE=LEGACY;NON_KEYWORDS=VALUE"/>
     <property name="username" value="sa"/>
     <property name="password" value=""/>
   </bean>
diff --git a/kie-osgi/kie-karaf-itests/pom.xml b/kie-osgi/kie-karaf-itests/pom.xml
index 905fa507be..82aba63c34 100644
--- a/kie-osgi/kie-karaf-itests/pom.xml
+++ b/kie-osgi/kie-karaf-itests/pom.xml
@@ -30,8 +30,8 @@
     <maven.jdbc.driver.jar/>
     <maven.jdbc.username>sa</maven.jdbc.username>
     <maven.jdbc.password>sa</maven.jdbc.password>
-    <maven.jdbc.url>jdbc:h2:mem:test_mem;MVCC=TRUE</maven.jdbc.url>
-    <maven.jdbc.tcp.url>jdbc:h2:tcp://localhost/${project.basedir}/target/kie-karaf-itests;MVCC=TRUE</maven.jdbc.tcp.url>
+    <maven.jdbc.url>jdbc:h2:mem:test_mem;MODE=LEGACY;NON_KEYWORDS=VALUE</maven.jdbc.url>
+    <maven.jdbc.tcp.url>jdbc:h2:tcp://localhost/${project.basedir}/target/kie-karaf-itests;MODE=LEGACY;NON_KEYWORDS=VALUE</maven.jdbc.tcp.url>
     <maven.jdbc.schema>public</maven.jdbc.schema>
   </properties>
 
diff --git a/kie-osgi/kie-karaf-itests/src/test/java/org/kie/karaf/itest/KieSpringjBPMPersistenceKarafIntegrationTest.java b/kie-osgi/kie-karaf-itests/src/test/java/org/kie/karaf/itest/KieSpringjBPMPersistenceKarafIntegrationTest.java
index 4bea2c9262..d0da413152 100644
--- a/kie-osgi/kie-karaf-itests/src/test/java/org/kie/karaf/itest/KieSpringjBPMPersistenceKarafIntegrationTest.java
+++ b/kie-osgi/kie-karaf-itests/src/test/java/org/kie/karaf/itest/KieSpringjBPMPersistenceKarafIntegrationTest.java
@@ -195,7 +195,7 @@ public Object call() {
     public static Server startH2Server() {
         try {
             // start h2 in memory database
-            Server server = Server.createTcpServer(new String[0]);
+            Server server = Server.createTcpServer(new String[]{"-ifNotExists"});
             server.start();
             return server;
         } catch (Throwable t) {
diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
index f5df0f1765..5aeedb8613 100644
--- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
+++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-all/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
@@ -46,7 +46,7 @@ protected void before() throws Throwable {
             Properties driverProperties = new Properties();
             driverProperties.setProperty("user", "sa");
             driverProperties.setProperty("password", "");
-            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MVCC=true");
+            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;NON_KEYWORDS=VALUE");
             driverProperties.setProperty("className", "org.h2.jdbcx.JdbcDataSource");
             driverProperties.setProperty("driverClassName", "org.h2.Driver");
 
diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
index 49b29b99c9..58995538d2 100644
--- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
+++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-jbpm/src/test/java/org/kie/server/integrationtests/jbpm/DBExternalResource.java
@@ -49,7 +49,7 @@ protected void before() throws Throwable {
             Properties driverProperties = new Properties();
             driverProperties.setProperty("user", "sa");
             driverProperties.setProperty("password", "");
-            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MVCC=true");
+            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;NON_KEYWORDS=VALUE");
             driverProperties.setProperty("className", "org.h2.jdbcx.JdbcDataSource");
             driverProperties.setProperty("driverClassName", "org.h2.Driver");
 
diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-policy/src/test/java/org/kie/server/integrationtests/policy/DBExternalResource.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-policy/src/test/java/org/kie/server/integrationtests/policy/DBExternalResource.java
index 56a3492721..ba4e747d07 100644
--- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-policy/src/test/java/org/kie/server/integrationtests/policy/DBExternalResource.java
+++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-policy/src/test/java/org/kie/server/integrationtests/policy/DBExternalResource.java
@@ -42,7 +42,7 @@ protected void before() throws Throwable {
             Properties driverProperties = new Properties();
             driverProperties.setProperty("user", "sa");
             driverProperties.setProperty("password", "");
-            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MVCC=true");
+            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;NON_KEYWORDS=VALUE");
             driverProperties.setProperty("className", "org.h2.jdbcx.JdbcDataSource");
             driverProperties.setProperty("driverClassName", "org.h2.Driver");
 
diff --git a/kie-server-parent/kie-server-tests/kie-server-integ-tests-router/src/test/java/org/kie/server/integrationtests/router/DBExternalResource.java b/kie-server-parent/kie-server-tests/kie-server-integ-tests-router/src/test/java/org/kie/server/integrationtests/router/DBExternalResource.java
index 619a9f8d73..b538e5a474 100644
--- a/kie-server-parent/kie-server-tests/kie-server-integ-tests-router/src/test/java/org/kie/server/integrationtests/router/DBExternalResource.java
+++ b/kie-server-parent/kie-server-tests/kie-server-integ-tests-router/src/test/java/org/kie/server/integrationtests/router/DBExternalResource.java
@@ -46,7 +46,7 @@ protected void before() throws Throwable {
             Properties driverProperties = new Properties();
             driverProperties.setProperty("user", "sa");
             driverProperties.setProperty("password", "");
-            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MVCC=true");
+            driverProperties.setProperty("url", "jdbc:h2:mem:jbpm-db;MODE=LEGACY;NON_KEYWORDS=VALUE");
             driverProperties.setProperty("className", "org.h2.jdbcx.JdbcDataSource");
             driverProperties.setProperty("driverClassName", "org.h2.Driver");
 
diff --git a/kie-server-parent/kie-server-tests/pom.xml b/kie-server-parent/kie-server-tests/pom.xml
index c9b81392f3..57c5c1e5c5 100644
--- a/kie-server-parent/kie-server-tests/pom.xml
+++ b/kie-server-parent/kie-server-tests/pom.xml
@@ -59,7 +59,7 @@
     <!-- Kie server datasource configuration. -->
     <!--  <org.kie.server.persistence.ds/> Defined in container profiles.-->
     <org.kie.server.persistence.dialect>org.hibernate.dialect.H2Dialect</org.kie.server.persistence.dialect>
-    <org.kie.server.datasource.connection.url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE</org.kie.server.datasource.connection.url>
+    <org.kie.server.datasource.connection.url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE;MODE=LEGACY;NON_KEYWORDS=VALUE</org.kie.server.datasource.connection.url>
     <org.kie.server.datasource.username>sa</org.kie.server.datasource.username>
     <org.kie.server.datasource.password>sa</org.kie.server.datasource.password>
     <org.kie.server.datasource.driver.class>org.h2.jdbcx.JdbcDataSource</org.kie.server.datasource.driver.class>
@@ -653,7 +653,7 @@
                       <parameters>
                         <user>sa</user>
                         <password>sa</password>
-                        <url>jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;MVCC=TRUE</url>
+                        <url>jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;MODE=LEGACY;NON_KEYWORDS=VALUE</url>
                         <description>H2 Data Source</description>
                         <loginTimeout>0</loginTimeout>
                         <testOnBorrow>false</testOnBorrow>
@@ -1175,7 +1175,7 @@
                     <!-- Datasource -->
                     <cargo.datasource.datasource.h2>
                       cargo.datasource.driver=org.h2.Driver|
-                      cargo.datasource.url=jdbc:h2:mem:test-db|
+                      cargo.datasource.url=jdbc:h2:mem:test-db;MODE=LEGACY;NON_KEYWORDS=VALUE|
                       cargo.datasource.jndi=jdbc/jbpm|
                       cargo.datasource.username=sa|
                       cargo.datasource.password=|
@@ -1311,7 +1311,7 @@
                     <!-- Datasource -->
                     <cargo.datasource.datasource.h2>
                       cargo.datasource.driver=org.h2.jdbcx.JdbcDataSource|
-                      cargo.datasource.url=jdbc:h2:mem:test-db|
+                      cargo.datasource.url=jdbc:h2:mem:test-db;MODE=LEGACY;NON_KEYWORDS=VALUE|
                       cargo.datasource.jndi=jdbc/jbpm|
                       cargo.datasource.username=sa|
                       cargo.datasource.password=|
diff --git a/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/java/org/kie/server/spring/boot/autoconfiguration/audit/replication/ApplicationSender.java b/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/java/org/kie/server/spring/boot/autoconfiguration/audit/replication/ApplicationSender.java
index 5b59985d02..70cc72e9bc 100644
--- a/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/java/org/kie/server/spring/boot/autoconfiguration/audit/replication/ApplicationSender.java
+++ b/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/java/org/kie/server/spring/boot/autoconfiguration/audit/replication/ApplicationSender.java
@@ -46,7 +46,7 @@ public DataSource secondaryDataSource() {
     @ConditionalOnMissingBean(name = "auditEntityManagerFactory")
     @ConditionalOnProperty(name = "kieserver.audit-replication.consumer", havingValue = "true")
     public LocalContainerEntityManagerFactoryBean entityManagerFactory(@Qualifier("datasource-replica") DataSource dataSource, JpaProperties jpaProperties) {
-        jpaProperties.getProperties().put("url", "jdbc:h2:mem:kieserver-replication");
+        jpaProperties.getProperties().put("url", "jdbc:h2:mem:kieserver-replication;MODE=LEGACY;NON_KEYWORDS=VALUE");
         return EntityManagerFactoryHelper.create(applicationContext,
                                                  dataSource,
                                                  jpaProperties,
diff --git a/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/resources/application-integrationtest.properties b/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/resources/application-integrationtest.properties
index e6b29d7d4a..9696f241ba 100644
--- a/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/resources/application-integrationtest.properties
+++ b/kie-spring-boot/kie-spring-boot-autoconfiguration/kie-server-spring-boot-autoconfiguration-audit-replication/src/test/resources/application-integrationtest.properties
@@ -41,11 +41,11 @@ jbpm.executor.enabled=false
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:mem:kieserver
+spring.datasource.url=jdbc:h2:mem:kieserver;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 spring.h2.console.enabled=true
 
-spring.datasource.second.url=jdbc:h2:mem:kieserver-replica
+spring.datasource.second.url=jdbc:h2:mem:kieserver-replica;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.second.username=sa
 spring.datasource.second.password=sa
 spring.datasource.second.driverClassName=org.h2.Driver
diff --git a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/main/resources/application.properties b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/main/resources/application.properties
index 28685f45da..19333feaa9 100644
--- a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/main/resources/application.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/main/resources/application.properties
@@ -8,7 +8,7 @@ server.port=8090
 spring.datasource.name=jbpm
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MVCC=true
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 
 narayana.dbcp.enabled=true
@@ -28,4 +28,4 @@ jbpm.executor.enabled=false
 #jbpm.executor.retries=5
 #jbpm.executor.interval=3
 #jbpm.executor.threadPoolSize=1
-#jbpm.executor.timeUnit=SECONDS
\ No newline at end of file
+#jbpm.executor.timeUnit=SECONDS
diff --git a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/application-quartz.properties b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/application-quartz.properties
index 4ffb85a63d..433c2e80b6 100644
--- a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/application-quartz.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/application-quartz.properties
@@ -16,7 +16,7 @@ jbpm.quartz.configuration=quartz-db.properties
 quartz.datasource.name=quartz
 quartz.datasource.username=sa
 quartz.datasource.password=sa
-quartz.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MVCC=true
+quartz.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 quartz.datasource.driver-class-name=org.h2.Driver
 
 quartz.datasource.dbcp2.maxTotal=15
@@ -24,4 +24,4 @@ quartz.datasource.dbcp2.maxTotal=15
 # use this to initialize quartz schema
 quartz.datasource.initialization=true
 spring.datasource.schema=classpath*:quartz_tables_h2.sql
-spring.datasource.initialization-mode=always
\ No newline at end of file
+spring.datasource.initialization-mode=always
diff --git a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/quartz_tables_h2.sql b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/quartz_tables_h2.sql
index abb38d5b65..e7d0e07f50 100644
--- a/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/quartz_tables_h2.sql
+++ b/kie-spring-boot/kie-spring-boot-samples/jbpm-spring-boot-sample-basic/src/test/resources/quartz_tables_h2.sql
@@ -8,18 +8,7 @@
 -- In your Quartz properties file, you'll need to set 
 -- org.quartz.jobStore.driverDelegateClass = org.quartz.impl.jdbcjobstore.StdJDBCDelegate
 
-DROP TABLE IF EXISTS QRTZ_CALENDARS;
-DROP TABLE IF EXISTS QRTZ_CRON_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_FIRED_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE IF EXISTS QRTZ_SCHEDULER_STATE;
-DROP TABLE IF EXISTS QRTZ_LOCKS;
-DROP TABLE IF EXISTS QRTZ_JOB_DETAILS;
-DROP TABLE IF EXISTS QRTZ_SIMPLE_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_SIMPROP_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_BLOB_TRIGGERS;
-DROP TABLE IF EXISTS QRTZ_TRIGGER_LISTENERS;
-DROP TABLE IF EXISTS QRTZ_TRIGGERS;
+DROP ALL OBJECTS;
 
 CREATE TABLE QRTZ_CALENDARS (
   SCHED_NAME VARCHAR(120) NOT NULL,
diff --git a/kie-spring-boot/kie-spring-boot-samples/keycloak-kie-server-spring-boot-sample/src/main/resources/application.properties b/kie-spring-boot/kie-spring-boot-samples/keycloak-kie-server-spring-boot-sample/src/main/resources/application.properties
index 3557aa13f7..a47d42b29f 100644
--- a/kie-spring-boot/kie-spring-boot-samples/keycloak-kie-server-spring-boot-sample/src/main/resources/application.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/keycloak-kie-server-spring-boot-sample/src/main/resources/application.properties
@@ -28,7 +28,7 @@ kieserver.scenariosimulation.enabled=true
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MVCC=true
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 
 narayana.dbcp.enabled=true
@@ -56,4 +56,4 @@ kie.restricted-role=President
 
 
 keycloak-identity.admin.user=admin
-keycloak-identity.admin.pwd=admin
\ No newline at end of file
+keycloak-identity.admin.pwd=admin
diff --git a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-integ-tests-sample/src/main/resources/application.properties b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-integ-tests-sample/src/main/resources/application.properties
index 1a52001229..fe8eb0b08d 100644
--- a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-integ-tests-sample/src/main/resources/application.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-integ-tests-sample/src/main/resources/application.properties
@@ -30,7 +30,7 @@ kieserver.scenariosimulation.enabled=true
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MVCC=true
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 
 narayana.dbcp.enabled=true
diff --git a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-kafka-sample/src/main/resources/application.properties b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-kafka-sample/src/main/resources/application.properties
index 486a1e6a00..8a277e1207 100644
--- a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-kafka-sample/src/main/resources/application.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-kafka-sample/src/main/resources/application.properties
@@ -29,7 +29,7 @@ kieserver.scenariosimulation.enabled=true
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MVCC=true
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 
 narayana.dbcp.enabled=true
diff --git a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/main/resources/application.properties b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/main/resources/application.properties
index 486a1e6a00..8a277e1207 100644
--- a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/main/resources/application.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/main/resources/application.properties
@@ -29,7 +29,7 @@ kieserver.scenariosimulation.enabled=true
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MVCC=true
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 
 narayana.dbcp.enabled=true
diff --git a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/test/resources/application-kafka.properties b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/test/resources/application-kafka.properties
index 866410b5e3..2f691d7086 100644
--- a/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/test/resources/application-kafka.properties
+++ b/kie-spring-boot/kie-spring-boot-samples/kie-server-spring-boot-sample/src/test/resources/application-kafka.properties
@@ -13,5 +13,5 @@ spring.jpa.properties.hibernate.show_sql=false
 
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-kafka-jbpm;MVCC=true
-spring.datasource.driver-class-name=org.h2.Driver
\ No newline at end of file
+spring.datasource.url=jdbc:h2:./target/spring-boot-kafka-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
+spring.datasource.driver-class-name=org.h2.Driver
diff --git a/kie-spring-boot/kie-spring-boot-starters/jbpm-spring-boot-starter-basic/README.md b/kie-spring-boot/kie-spring-boot-starters/jbpm-spring-boot-starter-basic/README.md
index 5e107c56ef..ff55f43ce0 100644
--- a/kie-spring-boot/kie-spring-boot-starters/jbpm-spring-boot-starter-basic/README.md
+++ b/kie-spring-boot/kie-spring-boot-starters/jbpm-spring-boot-starter-basic/README.md
@@ -40,7 +40,7 @@ Mandatory configuration that must be placed in application.properties is related
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MVCC=true
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.type=org.apache.tomcat.jdbc.pool.XADataSource
 
diff --git a/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter-jbpm/README.md b/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter-jbpm/README.md
index 617752a742..e16bbe8b49 100644
--- a/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter-jbpm/README.md
+++ b/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter-jbpm/README.md
@@ -41,7 +41,7 @@ Mandatory configuration that must be placed in application.properties is related
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MVCC=true
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.type=org.apache.tomcat.jdbc.pool.XADataSource
 
diff --git a/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter/README.md b/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter/README.md
index e5bbaace33..829458b08e 100644
--- a/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter/README.md
+++ b/kie-spring-boot/kie-spring-boot-starters/kie-server-spring-boot-starter/README.md
@@ -45,7 +45,7 @@ Mandatory configuration that must be placed in application.properties is related
 #data source configuration
 spring.datasource.username=sa
 spring.datasource.password=sa
-spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MVCC=true
+spring.datasource.url=jdbc:h2:./target/spring-boot-jbpm;MODE=LEGACY;NON_KEYWORDS=VALUE
 spring.datasource.driver-class-name=org.h2.Driver
 spring.datasource.type=org.apache.tomcat.jdbc.pool.XADataSource
 
diff --git a/kie-spring/src/test/java/org/kie/spring/jbpm/AbstractJbpmSpringTest.java b/kie-spring/src/test/java/org/kie/spring/jbpm/AbstractJbpmSpringTest.java
index 3c1483e28e..b947777d03 100644
--- a/kie-spring/src/test/java/org/kie/spring/jbpm/AbstractJbpmSpringTest.java
+++ b/kie-spring/src/test/java/org/kie/spring/jbpm/AbstractJbpmSpringTest.java
@@ -69,7 +69,7 @@ protected static PoolingDataSourceWrapper setupPoolingDataSource() {
         Properties driverProperties = new Properties();
         driverProperties.put("user", "sa");
         driverProperties.put("password", "");
-        driverProperties.put("url", "jdbc:h2:mem:mydb;MVCC=true");
+        driverProperties.put("url", "jdbc:h2:mem:mydb;MODE=LEGACY;NON_KEYWORDS=VALUE");
         driverProperties.put("driverClassName", "org.h2.Driver");
         driverProperties.put("className", "org.h2.jdbcx.JdbcDataSource");
         return DataSourceFactory.setupPoolingDataSource("jdbc/jbpm-ds", driverProperties);
diff --git a/kie-spring/src/test/java/org/kie/spring/tests/KieSpringEnvironmentTest.java b/kie-spring/src/test/java/org/kie/spring/tests/KieSpringEnvironmentTest.java
index 0470acd996..432a671131 100644
--- a/kie-spring/src/test/java/org/kie/spring/tests/KieSpringEnvironmentTest.java
+++ b/kie-spring/src/test/java/org/kie/spring/tests/KieSpringEnvironmentTest.java
@@ -43,7 +43,7 @@ public static void startH2Database() throws Exception {
         DeleteDbFiles.execute("",
                 "DroolsFlow",
                 true);
-        h2Server = Server.createTcpServer(new String[0]);
+        h2Server = Server.createTcpServer(new String[]{"-ifNotExists"});
         h2Server.start();
     }
 
diff --git a/kie-spring/src/test/java/org/kie/spring/tests/persistence/JPASingleSessionCommandServiceFactoryEnvTest.java b/kie-spring/src/test/java/org/kie/spring/tests/persistence/JPASingleSessionCommandServiceFactoryEnvTest.java
index a6821a7700..5cc5092db2 100644
--- a/kie-spring/src/test/java/org/kie/spring/tests/persistence/JPASingleSessionCommandServiceFactoryEnvTest.java
+++ b/kie-spring/src/test/java/org/kie/spring/tests/persistence/JPASingleSessionCommandServiceFactoryEnvTest.java
@@ -77,7 +77,7 @@ public static void startH2Database() throws Exception {
         DeleteDbFiles.execute("",
                 "DroolsFlow",
                 true);
-        h2Server = Server.createTcpServer(new String[0]);
+        h2Server = Server.createTcpServer(new String[]{"-ifNotExists"});
         h2Server.start();
         try {
             TMPDIR = JPASingleSessionCommandServiceFactoryEnvTest.class.getResource("/kb_persistence").getFile();
diff --git a/kie-spring/src/test/java/org/kie/spring/tests/persistence/JPASingleSessionCommandServiceFactoryTest.java b/kie-spring/src/test/java/org/kie/spring/tests/persistence/JPASingleSessionCommandServiceFactoryTest.java
index d698f4dacc..b7067a4df4 100644
--- a/kie-spring/src/test/java/org/kie/spring/tests/persistence/JPASingleSessionCommandServiceFactoryTest.java
+++ b/kie-spring/src/test/java/org/kie/spring/tests/persistence/JPASingleSessionCommandServiceFactoryTest.java
@@ -82,7 +82,7 @@ public static void startH2Database() throws Exception {
         DeleteDbFiles.execute("",
                 "DroolsFlow",
                 true);
-        h2Server = Server.createTcpServer(new String[0]);
+        h2Server = Server.createTcpServer(new String[]{"-ifNotExists"});
         h2Server.start();
         try {
             TMPDIR = JPASingleSessionCommandServiceFactoryTest.class.getResource("/kb_persistence").getFile();
diff --git a/kie-spring/src/test/java/org/kie/spring/tests/persistence/VariablePersistenceStrategyEnvTest.java b/kie-spring/src/test/java/org/kie/spring/tests/persistence/VariablePersistenceStrategyEnvTest.java
index 77e843d50c..366faac504 100644
--- a/kie-spring/src/test/java/org/kie/spring/tests/persistence/VariablePersistenceStrategyEnvTest.java
+++ b/kie-spring/src/test/java/org/kie/spring/tests/persistence/VariablePersistenceStrategyEnvTest.java
@@ -59,7 +59,7 @@ public static void startH2Database() throws Exception {
         DeleteDbFiles.execute("",
                 "DroolsFlow",
                 true);
-        h2Server = Server.createTcpServer(new String[0]);
+        h2Server = Server.createTcpServer(new String[]{"-ifNotExists"});
         h2Server.start();
     }
 
diff --git a/kie-spring/src/test/java/org/kie/spring/tests/persistence/VariablePersistenceStrategyTest.java b/kie-spring/src/test/java/org/kie/spring/tests/persistence/VariablePersistenceStrategyTest.java
index f489080753..32d6b95fc8 100644
--- a/kie-spring/src/test/java/org/kie/spring/tests/persistence/VariablePersistenceStrategyTest.java
+++ b/kie-spring/src/test/java/org/kie/spring/tests/persistence/VariablePersistenceStrategyTest.java
@@ -66,7 +66,7 @@ public static void startH2Database() throws Exception {
         DeleteDbFiles.execute("",
                 "DroolsFlow",
                 true);
-        h2Server = Server.createTcpServer(new String[0]);
+        h2Server = Server.createTcpServer(new String[]{"-ifNotExists"});
         h2Server.start();
     }
 
diff --git a/kie-spring/src/test/resources/jbpm/no-initial-context/datasource-local.xml b/kie-spring/src/test/resources/jbpm/no-initial-context/datasource-local.xml
index 60259dc4a1..19cd0375f1 100644
--- a/kie-spring/src/test/resources/jbpm/no-initial-context/datasource-local.xml
+++ b/kie-spring/src/test/resources/jbpm/no-initial-context/datasource-local.xml
@@ -10,10 +10,10 @@
       <props>
         <prop key="user">sa</prop>
         <prop key="password"></prop>
-        <prop key="url">jdbc:h2:mem:jbpm-db;MVCC=true</prop>
+        <prop key="url">jdbc:h2:mem:jbpm-db;MODE=LEGACY;NON_KEYWORDS=VALUE</prop>
       </props>
     </property>
   </bean>
 
   <bean id="poolingDataSource" factory-bean="dataSourceFactory" factory-method="setupPoolingDataSource" destroy-method="close"/>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/kie-spring/src/test/resources/jbpm/services/jta-services.xml b/kie-spring/src/test/resources/jbpm/services/jta-services.xml
index 40244bf6a6..596b0a1fb9 100644
--- a/kie-spring/src/test/resources/jbpm/services/jta-services.xml
+++ b/kie-spring/src/test/resources/jbpm/services/jta-services.xml
@@ -20,7 +20,7 @@
       <props>
         <prop key="user">sa</prop>
         <prop key="password">sa</prop>
-        <prop key="url">jdbc:h2:mem:jbpm-services-db;MVCC=true</prop>
+        <prop key="url">jdbc:h2:mem:jbpm-services-db;MODE=LEGACY;NON_KEYWORDS=VALUE</prop>
       </props>
     </property>
   </bean>
diff --git a/kie-spring/src/test/resources/jbpm/services/resource-local-services.xml b/kie-spring/src/test/resources/jbpm/services/resource-local-services.xml
index 7b108b1f9c..021ae0acc7 100644
--- a/kie-spring/src/test/resources/jbpm/services/resource-local-services.xml
+++ b/kie-spring/src/test/resources/jbpm/services/resource-local-services.xml
@@ -19,7 +19,7 @@
       <props>
         <prop key="user">sa</prop>
         <prop key="password">sa</prop>
-        <prop key="url">jdbc:h2:mem:jbpm-services-db;MVCC=true</prop>
+        <prop key="url">jdbc:h2:mem:jbpm-services-db;MODE=LEGACY;NON_KEYWORDS=VALUE</prop>
       </props>
     </property>
   </bean>
diff --git a/kie-spring/src/test/resources/org/kie/spring/environment.xml b/kie-spring/src/test/resources/org/kie/spring/environment.xml
index f332a57e6d..2a3a9a21ec 100644
--- a/kie-spring/src/test/resources/org/kie/spring/environment.xml
+++ b/kie-spring/src/test/resources/org/kie/spring/environment.xml
@@ -15,7 +15,7 @@
 
   <bean id="ds" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
     <property name="driverClassName" value="org.h2.Driver"/>
-    <property name="url" value="jdbc:h2:tcp://localhost/./DroolsFlow"/>
+    <property name="url" value="jdbc:h2:tcp://localhost/./DroolsFlow;MODE=LEGACY;NON_KEYWORDS=VALUE"/>
     <property name="username" value="sa"/>
     <property name="password" value=""/>
   </bean>
diff --git a/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_beans.xml b/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_beans.xml
index a8804fe8cf..ced6a4f7ec 100644
--- a/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_beans.xml
+++ b/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_beans.xml
@@ -55,7 +55,7 @@
     <property name="driverClassName" value="org.h2.Driver"/>
     <!-- jdbc:h2:mem:mydb
     jdbc:h2:tcp://localhost/DroolsFlow-->
-    <property name="url" value="jdbc:h2:tcp://localhost/./DroolsFlow"/>
+    <property name="url" value="jdbc:h2:tcp://localhost/./DroolsFlow;MODE=LEGACY;NON_KEYWORDS=VALUE"/>
     <property name="username" value="sa"/>
     <property name="password" value=""/>
   </bean>
diff --git a/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_beans_env.xml b/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_beans_env.xml
index 068444eba4..c6fc0fda65 100644
--- a/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_beans_env.xml
+++ b/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_beans_env.xml
@@ -7,7 +7,7 @@
 
   <bean id="ds" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
     <property name="driverClassName" value="org.h2.Driver"/>
-    <property name="url" value="jdbc:h2:tcp://localhost/./DroolsFlow"/>
+    <property name="url" value="jdbc:h2:tcp://localhost/./DroolsFlow;MODE=LEGACY;NON_KEYWORDS=VALUE"/>
     <property name="username" value="sa"/>
     <property name="password" value=""/>
   </bean>
diff --git a/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_var_beans.xml b/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_var_beans.xml
index 4265d904e6..46e2303f23 100644
--- a/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_var_beans.xml
+++ b/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_var_beans.xml
@@ -7,7 +7,7 @@
 
   <bean id="ds" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
     <property name="driverClassName" value="org.h2.Driver"/>
-    <property name="url" value="jdbc:h2:tcp://localhost/./DroolsFlow"/>
+    <property name="url" value="jdbc:h2:tcp://localhost/./DroolsFlow;MODE=LEGACY;NON_KEYWORDS=VALUE"/>
     <property name="username" value="sa"/>
     <property name="password" value=""/>
   </bean>
diff --git a/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_var_beans_env.xml b/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_var_beans_env.xml
index 42eaf1edc8..0fa32b158f 100644
--- a/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_var_beans_env.xml
+++ b/kie-spring/src/test/resources/org/kie/spring/persistence/persistence_var_beans_env.xml
@@ -7,7 +7,7 @@
 
   <bean id="ds" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
     <property name="driverClassName" value="org.h2.Driver"/>
-    <property name="url" value="jdbc:h2:tcp://localhost/./DroolsFlow"/>
+    <property name="url" value="jdbc:h2:tcp://localhost/./DroolsFlow;MODE=LEGACY;NON_KEYWORDS=VALUE"/>
     <property name="username" value="sa"/>
     <property name="password" value=""/>
   </bean>
diff --git a/kie-spring/src/test/resources/org/kie/spring/timer/conf/spring-conf.xml b/kie-spring/src/test/resources/org/kie/spring/timer/conf/spring-conf.xml
index 5e7763121e..8e2e6dee65 100644
--- a/kie-spring/src/test/resources/org/kie/spring/timer/conf/spring-conf.xml
+++ b/kie-spring/src/test/resources/org/kie/spring/timer/conf/spring-conf.xml
@@ -9,7 +9,7 @@
 
   <bean id="hsDs" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
     <property name="driverClassName" value="org.h2.Driver"/>
-    <property name="url" value="jdbc:h2:mem:drools-spring-workflow;MVCC=true"/>
+    <property name="url" value="jdbc:h2:mem:drools-spring-workflow;MODE=LEGACY;NON_KEYWORDS=VALUE"/>
     <property name="username" value="sa"/>
     <property name="password" value=""/>
   </bean>