diff --git a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EngineMappingsValidationTest.java b/modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EngineMappingsValidationTest.java
similarity index 97%
rename from modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EngineMappingsValidationTest.java
rename to modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EngineMappingsValidationTest.java
index fd5659d68a3..e24db960531 100644
--- a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EngineMappingsValidationTest.java
+++ b/modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EngineMappingsValidationTest.java
@@ -10,11 +10,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.flowable.test.spring.boot.db;
+package org.flowable.test.persistence;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.flowable.test.spring.boot.db.EntityParameterTypesOverview.getColumnType;
-import static org.flowable.test.spring.boot.db.EntityParameterTypesOverview.getParameterType;
+import static org.flowable.test.persistence.EntityParameterTypesOverview.getColumnType;
+import static org.flowable.test.persistence.EntityParameterTypesOverview.getParameterType;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -39,8 +39,8 @@
 import javax.xml.transform.stream.StreamResult;
 
 import org.apache.commons.lang3.StringUtils;
-import org.flowable.test.spring.boot.db.EntityHelperUtil.EntityMappingPackageInformation;
-import org.flowable.test.spring.boot.db.EntityHelperUtil.EntityPackageTestArgumentsProvider;
+import org.flowable.test.persistence.EntityHelperUtil.EntityMappingPackageInformation;
+import org.flowable.test.persistence.EntityHelperUtil.EntityPackageTestArgumentsProvider;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 import org.w3c.dom.Document;
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EntityHelperUtil.java b/modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EntityHelperUtil.java
similarity index 99%
rename from modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EntityHelperUtil.java
rename to modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EntityHelperUtil.java
index 08eb87fc316..f6a3432883f 100644
--- a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EntityHelperUtil.java
+++ b/modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EntityHelperUtil.java
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.flowable.test.spring.boot.db;
+package org.flowable.test.persistence;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EntityParameterTypesOverview.java b/modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EntityParameterTypesOverview.java
similarity index 99%
rename from modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EntityParameterTypesOverview.java
rename to modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EntityParameterTypesOverview.java
index e4cf159ea22..725a2c10796 100644
--- a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/EntityParameterTypesOverview.java
+++ b/modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/EntityParameterTypesOverview.java
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.flowable.test.spring.boot.db;
+package org.flowable.test.persistence;
 
 import java.util.HashMap;
 import java.util.Locale;
diff --git a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/TableColumnTypeValidationTest.java b/modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/TableColumnTypeValidationTest.java
similarity index 98%
rename from modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/TableColumnTypeValidationTest.java
rename to modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/TableColumnTypeValidationTest.java
index 40cf89a69b3..b0467fdd039 100644
--- a/modules/flowable-spring-boot/flowable-spring-boot-samples/flowable-spring-boot-sample-rest-api/src/test/java/org/flowable/test/spring/boot/db/TableColumnTypeValidationTest.java
+++ b/modules/flowable-app-rest/src/test/java/org/flowable/test/persistence/TableColumnTypeValidationTest.java
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.flowable.test.spring.boot.db;
+package org.flowable.test.persistence;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -27,20 +27,19 @@
 import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.engine.impl.db.DbSqlSession;
 import org.flowable.engine.ProcessEngine;
+import org.flowable.rest.app.FlowableRestApplication;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ArgumentsSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import flowable.Application;
-
 /**
  * This test was introduced after the major refactoring of the varchar / nvarchar mappings of colum types in the MyBatis files.
  * The @{@link EngineMappingsValidationTest} tests the mapping xml's itself, this test compares the expected column types with the real JDBC metadata.
  * Since it runs on the QA env, it will be validated for each database.
  */
-@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(classes = FlowableRestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class TableColumnTypeValidationTest {
 
     @Autowired
diff --git a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/persistence/CmmnEngineDropScriptsTest.java b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/persistence/CmmnEngineDropScriptsTest.java
index 8fef61a7eb7..5a1dbca30b5 100644
--- a/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/persistence/CmmnEngineDropScriptsTest.java
+++ b/modules/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/persistence/CmmnEngineDropScriptsTest.java
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.flowable.cmmn.test.db;
+package org.flowable.cmmn.test.persistence;
 
 import static org.assertj.core.api.Assertions.assertThat;