diff --git a/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperUDTTest.java b/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperUDTTest.java
index 12fb9b4f4b5..1c5f206aea0 100644
--- a/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperUDTTest.java
+++ b/driver-mapping/src/test/java/com/datastax/driver/mapping/MapperUDTTest.java
@@ -560,8 +560,9 @@ public void should_throw_error_when_table_is_altered_and_is_not_compatible_anymo
     } catch (InvalidQueryException e) {
       // Error message varies by C* version.
       assertThat(e.getMessage())
+          // "Unrecognized name mainaddress" since scylla-5.4.0-rc0 and scylla-2024.1.0-rc1
           .matches(
-              "(Undefined name mainaddress in selection clause|Undefined column name mainaddress.*)");
+              "(Unrecognized name mainaddress|Undefined name mainaddress in selection clause|Undefined column name mainaddress.*)");
     }
     // trying to use a new mapper
     try {