diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleEntityUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleEntityUnitTests.java
index 150204b5b..bc38125e8 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleEntityUnitTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTupleEntityUnitTests.java
@@ -99,7 +99,7 @@ void shouldReportMissingAnnotations() {
 		assertThatThrownBy(() -> this.mappingContext.getRequiredPersistentEntity(MissingAnnotation.class))
 				.isInstanceOf(MappingException.class)
 				.cause()
-				.hasMessageContaining("Missing @Element annotation in mapped tuple type for property [street]");
+				.hasMessageMatching(".*Missing @Element annotation in mapped tuple type for property \\[(street|city)\\].*");
 	}
 
 	@Tuple