diff --git a/history/taskana-simplehistory-provider/pom.xml b/history/taskana-simplehistory-provider/pom.xml
index fd5e3d125..19fe46c16 100644
--- a/history/taskana-simplehistory-provider/pom.xml
+++ b/history/taskana-simplehistory-provider/pom.xml
@@ -26,6 +26,19 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>${version.slf4j}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.mybatis</groupId>
+			<artifactId>mybatis</artifactId>
+			<version>${version.mybatis}</version>
+		</dependency>
+
+		<!-- test dependencies -->
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${version.assertj}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
@@ -38,11 +51,6 @@
 			<version>${version.log4j}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.mybatis</groupId>
-			<artifactId>mybatis</artifactId>
-			<version>${version.mybatis}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
@@ -79,7 +87,6 @@
 			<version>${version.mockito}</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
diff --git a/history/taskana-simplehistory-spring-test/pom.xml b/history/taskana-simplehistory-spring-test/pom.xml
index a6ca15eb3..d81b51daa 100644
--- a/history/taskana-simplehistory-spring-test/pom.xml
+++ b/history/taskana-simplehistory-spring-test/pom.xml
@@ -50,6 +50,14 @@
 			<groupId>org.springframework.plugin</groupId>
 			<artifactId>spring-plugin-core</artifactId>
 		</dependency>
+
+		<!-- test dependencies -->
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${version.assertj}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
diff --git a/lib/taskana-cdi/pom.xml b/lib/taskana-cdi/pom.xml
index 09011ef9e..dce18af21 100644
--- a/lib/taskana-cdi/pom.xml
+++ b/lib/taskana-cdi/pom.xml
@@ -25,6 +25,13 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<!-- TEST dependencies -->
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${version.assertj}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
diff --git a/lib/taskana-core/pom.xml b/lib/taskana-core/pom.xml
index 2b7ad76df..c4f5e5ce3 100644
--- a/lib/taskana-core/pom.xml
+++ b/lib/taskana-core/pom.xml
@@ -48,6 +48,12 @@
 			<version>${version.junit.jupiter}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${version.assertj}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
diff --git a/lib/taskana-data/pom.xml b/lib/taskana-data/pom.xml
index ce2e51e17..c74c11414 100644
--- a/lib/taskana-data/pom.xml
+++ b/lib/taskana-data/pom.xml
@@ -24,12 +24,20 @@
 			<artifactId>slf4j-api</artifactId>
 			<version>${version.slf4j}</version>
 		</dependency>
+
+		<!-- test dependencies -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
 			<version>${version.slf4j}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${version.assertj}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
diff --git a/lib/taskana-spring-example/pom.xml b/lib/taskana-spring-example/pom.xml
index 230d5bee8..71a1a213a 100644
--- a/lib/taskana-spring-example/pom.xml
+++ b/lib/taskana-spring-example/pom.xml
@@ -35,6 +35,7 @@
 			<version>${project.version}</version>
 		</dependency>
 
+		<!-- test dependencies -->
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
@@ -53,6 +54,12 @@
 			<version>${version.junit.jupiter}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${version.assertj}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
diff --git a/lib/taskana-spring/pom.xml b/lib/taskana-spring/pom.xml
index aa4460105..9c59cc907 100644
--- a/lib/taskana-spring/pom.xml
+++ b/lib/taskana-spring/pom.xml
@@ -36,7 +36,7 @@
 			<version>${version.spring.mybatis}</version>
 		</dependency>
 
-		<!-- Tests -->
+		<!-- test dependencies -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -55,6 +55,12 @@
 			<version>${version.spring.boot}</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${version.assertj}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
diff --git a/pom.xml b/pom.xml
index 118964707..e01579e7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,9 @@
 		<version.spring.ldap>2.3.2.RELEASE</version.spring.ldap>
 		<version.spring.hateos>0.24.0.RELEASE</version.spring.hateos>
 
+		<!-- wildfly dependencies -->
+		<version.wildfly>11.0.0.Final</version.wildfly>
+
 		<!-- java ee dependencies -->
 		<version.resteasy>4.4.2.Final</version.resteasy>
 		<version.thorntail>2.6.0.Final</version.thorntail>
@@ -66,6 +69,7 @@
 		<version.arquillian>1.6.0.Final</version.arquillian>
 
 		<!-- test dependencies -->
+		<version.assertj>3.14.0</version.assertj>
 		<version.junit.jupiter>5.6.0</version.junit.jupiter>
 		<version.log4j>2.13.0</version.log4j>
 		<version.archunit>0.13.0</version.archunit>
diff --git a/rest/taskana-rest-spring-example-common/pom.xml b/rest/taskana-rest-spring-example-common/pom.xml
index b21be1d2d..946d41d0f 100644
--- a/rest/taskana-rest-spring-example-common/pom.xml
+++ b/rest/taskana-rest-spring-example-common/pom.xml
@@ -60,6 +60,11 @@
 			<artifactId>spring-ldap-core</artifactId>
 			<version>${version.spring.ldap}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
+			<version>${version.spring.boot}</version>
+		</dependency>
 		<!--
 	      Since taskana-web packs its content in /static, we do not have to unpack it again.
 	      However, when any local change has to be done to that folder you have to copy
@@ -70,14 +75,20 @@
 			<artifactId>taskana-web</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<!-- Tests -->
+
+		<!-- test dependencies -->
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${version.assertj}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<version>${version.spring.boot}</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-test</artifactId>
@@ -90,7 +101,6 @@
 			<version>${version.h2}</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
@@ -109,7 +119,6 @@
 			<version>${version.junit.jupiter}</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.ldap</groupId>
 			<artifactId>spring-ldap-test</artifactId>
@@ -122,11 +131,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-			<version>${version.spring.boot}</version>
-		</dependency>
 	</dependencies>
 
 </project>
\ No newline at end of file
diff --git a/rest/taskana-rest-spring-example-wildfly/pom.xml b/rest/taskana-rest-spring-example-wildfly/pom.xml
index 3e954bdab..c87a9d4e6 100644
--- a/rest/taskana-rest-spring-example-wildfly/pom.xml
+++ b/rest/taskana-rest-spring-example-wildfly/pom.xml
@@ -91,7 +91,13 @@
 			<version>${version.wildfly.security}</version>
 		</dependency>
 
-		<!-- TEST -->
+		<!-- test dependencies -->
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${version.assertj}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
@@ -110,7 +116,6 @@
 			<version>${version.junit.jupiter}</version>
 			<scope>test</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.jboss.resteasy</groupId>
 			<artifactId>resteasy-client</artifactId>
@@ -176,7 +181,7 @@
 				<artifactId>wildfly-maven-plugin</artifactId>
 				<version>${version.maven.wildfly}</version>
 				<configuration>
-					<version>11.0.0.Final</version>
+					<version>${version.wildfly}</version>
 					<add-user>
 						<users>
 							<user>
diff --git a/rest/taskana-rest-spring/pom.xml b/rest/taskana-rest-spring/pom.xml
index 3384b4f96..bbfefa2a3 100644
--- a/rest/taskana-rest-spring/pom.xml
+++ b/rest/taskana-rest-spring/pom.xml
@@ -84,7 +84,13 @@
 			<version>${version.aspectjweaver}</version>
 		</dependency>
 
-		<!-- TEST -->
+		<!-- test dependencies -->
+		<dependency>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>${version.assertj}</version>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>pro.taskana</groupId>
 			<artifactId>taskana-data</artifactId>