diff --git a/src/test/java/org/springframework/data/neo4j/integration/conversion_imperative/TypeConversionIT.java b/src/test/java/org/springframework/data/neo4j/integration/conversion_imperative/TypeConversionIT.java
index d6a8abbe7..51cca1ce1 100644
--- a/src/test/java/org/springframework/data/neo4j/integration/conversion_imperative/TypeConversionIT.java
+++ b/src/test/java/org/springframework/data/neo4j/integration/conversion_imperative/TypeConversionIT.java
@@ -117,7 +117,7 @@ class TypeConversionIT extends Neo4jConversionsITBase {
 				.isThrownBy(() -> template.findById(id, AllArgsCtorNoBuilder.class))
 				.withMessageMatching("Error mapping Record<\\{.+: .*>")
 				.withRootCauseInstanceOf(IllegalArgumentException.class)
-				.withStackTraceContaining("Parameter aBoolean must not be null!");
+				.withStackTraceContaining("Parameter aBoolean must not be null");
 	}
 
 	@TestFactory
diff --git a/src/test/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactoryTest.java b/src/test/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactoryTest.java
index a33d885e6..a9e28df6f 100644
--- a/src/test/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactoryTest.java
+++ b/src/test/java/org/springframework/data/neo4j/repository/support/Neo4jRepositoryFactoryTest.java
@@ -77,7 +77,7 @@ class Neo4jRepositoryFactoryTest {
 			when(metadata.getIdType()).thenReturn(repositoryIdentifierClass);
 
 			assertThatThrownBy(() -> neo4jRepositoryFactory.getTargetRepository(metadata))
-					.hasMessage("Target type must not be null!").isInstanceOf(IllegalArgumentException.class);
+					.hasMessageContaining("Target type must not be null").isInstanceOf(IllegalArgumentException.class);
 		}
 
 		@Test
diff --git a/src/test/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryTest.java b/src/test/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryTest.java
index c189dd4a8..d8d867440 100644
--- a/src/test/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryTest.java
+++ b/src/test/java/org/springframework/data/neo4j/repository/support/ReactiveNeo4jRepositoryFactoryTest.java
@@ -63,7 +63,7 @@ class ReactiveNeo4jRepositoryFactoryTest {
 			when(metadata.getIdType()).thenReturn(repositoryIdentifierClass);
 
 			assertThatThrownBy(() -> neo4jRepositoryFactory.getTargetRepository(metadata))
-					.hasMessage("Target type must not be null!").isInstanceOf(IllegalArgumentException.class);
+					.hasMessageContaining("Target type must not be null").isInstanceOf(IllegalArgumentException.class);
 		}
 
 		@Test