diff --git a/modules/flowable-assertions/pom.xml b/modules/flowable-assertions/pom.xml
deleted file mode 100644
index 1098a519ae9..00000000000
--- a/modules/flowable-assertions/pom.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.flowable</groupId>
-        <artifactId>flowable-root</artifactId>
-        <version>7.1.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <packaging>pom</packaging>
-
-    <artifactId>flowable-assertions</artifactId>
-
-    <modules>
-        <module>flowable-process-assertions</module>
-    </modules>
-
-    <dependencyManagement>
-        <dependencies>
-
-        </dependencies>
-    </dependencyManagement>
-</project>
\ No newline at end of file
diff --git a/modules/flowable-assertions/flowable-process-assertions/pom.xml b/modules/flowable-assertj/pom.xml
similarity index 88%
rename from modules/flowable-assertions/flowable-process-assertions/pom.xml
rename to modules/flowable-assertj/pom.xml
index e840a9e0479..5fb3762fa71 100644
--- a/modules/flowable-assertions/flowable-process-assertions/pom.xml
+++ b/modules/flowable-assertj/pom.xml
@@ -5,11 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.flowable</groupId>
-        <artifactId>flowable-assertions</artifactId>
+        <artifactId>flowable-root</artifactId>
+        <relativePath>../..</relativePath>
         <version>7.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>flowable-process-assertions</artifactId>
+    <artifactId>flowable-assertj</artifactId>
 
     <dependencies>
         <dependency>
@@ -20,6 +21,7 @@
         <dependency>
             <groupId>org.flowable</groupId>
             <artifactId>flowable-engine</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.zaxxer</groupId>
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/main/java/org/flowable/assertions/process/FlowableProcessAssertions.java b/modules/flowable-assertj/src/main/java/org/flowable/assertions/process/FlowableProcessAssertions.java
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/main/java/org/flowable/assertions/process/FlowableProcessAssertions.java
rename to modules/flowable-assertj/src/main/java/org/flowable/assertions/process/FlowableProcessAssertions.java
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/main/java/org/flowable/assertions/process/HistoricProcessInstanceAssert.java b/modules/flowable-assertj/src/main/java/org/flowable/assertions/process/HistoricProcessInstanceAssert.java
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/main/java/org/flowable/assertions/process/HistoricProcessInstanceAssert.java
rename to modules/flowable-assertj/src/main/java/org/flowable/assertions/process/HistoricProcessInstanceAssert.java
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/main/java/org/flowable/assertions/process/ProcessInstanceAssert.java b/modules/flowable-assertj/src/main/java/org/flowable/assertions/process/ProcessInstanceAssert.java
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/main/java/org/flowable/assertions/process/ProcessInstanceAssert.java
rename to modules/flowable-assertj/src/main/java/org/flowable/assertions/process/ProcessInstanceAssert.java
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/main/java/org/flowable/assertions/process/ProcessServicesProvider.java b/modules/flowable-assertj/src/main/java/org/flowable/assertions/process/ProcessServicesProvider.java
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/main/java/org/flowable/assertions/process/ProcessServicesProvider.java
rename to modules/flowable-assertj/src/main/java/org/flowable/assertions/process/ProcessServicesProvider.java
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/main/java/org/flowable/assertions/process/Utils.java b/modules/flowable-assertj/src/main/java/org/flowable/assertions/process/Utils.java
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/main/java/org/flowable/assertions/process/Utils.java
rename to modules/flowable-assertj/src/main/java/org/flowable/assertions/process/Utils.java
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/test/java/org/flowable/assertions/process/HistoricProcessInstanceAssertTest.java b/modules/flowable-assertj/src/test/java/org/flowable/assertions/process/HistoricProcessInstanceAssertTest.java
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/test/java/org/flowable/assertions/process/HistoricProcessInstanceAssertTest.java
rename to modules/flowable-assertj/src/test/java/org/flowable/assertions/process/HistoricProcessInstanceAssertTest.java
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/test/java/org/flowable/assertions/process/LongRunningProcessInstanceAssertTest.java b/modules/flowable-assertj/src/test/java/org/flowable/assertions/process/LongRunningProcessInstanceAssertTest.java
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/test/java/org/flowable/assertions/process/LongRunningProcessInstanceAssertTest.java
rename to modules/flowable-assertj/src/test/java/org/flowable/assertions/process/LongRunningProcessInstanceAssertTest.java
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/test/java/org/flowable/assertions/process/ProcessInstanceAssertTest.java b/modules/flowable-assertj/src/test/java/org/flowable/assertions/process/ProcessInstanceAssertTest.java
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/test/java/org/flowable/assertions/process/ProcessInstanceAssertTest.java
rename to modules/flowable-assertj/src/test/java/org/flowable/assertions/process/ProcessInstanceAssertTest.java
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/test/java/org/flowable/assertions/process/TestUtils.java b/modules/flowable-assertj/src/test/java/org/flowable/assertions/process/TestUtils.java
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/test/java/org/flowable/assertions/process/TestUtils.java
rename to modules/flowable-assertj/src/test/java/org/flowable/assertions/process/TestUtils.java
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/test/resources/flowable.cfg.xml b/modules/flowable-assertj/src/test/resources/flowable.cfg.xml
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/test/resources/flowable.cfg.xml
rename to modules/flowable-assertj/src/test/resources/flowable.cfg.xml
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/test/resources/log4j.properties b/modules/flowable-assertj/src/test/resources/log4j.properties
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/test/resources/log4j.properties
rename to modules/flowable-assertj/src/test/resources/log4j.properties
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/test/resources/oneTask.bpmn20.xml b/modules/flowable-assertj/src/test/resources/oneTask.bpmn20.xml
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/test/resources/oneTask.bpmn20.xml
rename to modules/flowable-assertj/src/test/resources/oneTask.bpmn20.xml
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/test/resources/oneTaskWithBoundaryEvent.bpmn20.xml b/modules/flowable-assertj/src/test/resources/oneTaskWithBoundaryEvent.bpmn20.xml
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/test/resources/oneTaskWithBoundaryEvent.bpmn20.xml
rename to modules/flowable-assertj/src/test/resources/oneTaskWithBoundaryEvent.bpmn20.xml
diff --git a/modules/flowable-assertions/flowable-process-assertions/src/test/resources/twoTasks.bpmn20.xml b/modules/flowable-assertj/src/test/resources/twoTasks.bpmn20.xml
similarity index 100%
rename from modules/flowable-assertions/flowable-process-assertions/src/test/resources/twoTasks.bpmn20.xml
rename to modules/flowable-assertj/src/test/resources/twoTasks.bpmn20.xml
diff --git a/pom.xml b/pom.xml
index c1d73b484b1..3ca4e154691 100644
--- a/pom.xml
+++ b/pom.xml
@@ -536,7 +536,7 @@
 		<module>modules/flowable-spring-security</module>
         <module>modules/flowable-http-common</module>
         <module>modules/flowable-mail</module>
-        <module>modules/flowable-assertions</module>
+        <module>modules/flowable-assertj</module>
     </modules>
 
 	<build>
@@ -1024,7 +1024,7 @@
 				<module>modules/flowable-ldap</module>
 				<module>modules/flowable-ldap-configurator</module>
 				<module>modules/flowable-jmx</module>
-				<module>modules/flowable-assertions</module>
+				<module>modules/flowable-assertj</module>
 				<module>tooling/archetypes/flowable-archetype-unittest</module>
 			</modules>
 			<build>