diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
index b3bdc17db3..2fd51c0d3b 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/DefaultTypeManagerTest.java
@@ -57,7 +57,7 @@ public void enumDayMonth_builtIn_overrideAsString() {
       assertThat(true).isFalse().as("never get here");
 
     } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
     }
   }
 
@@ -72,7 +72,7 @@ public void enumMonth_builtIn_overrideAsOrdinal() {
       typeManager.enumType(Month.class, EnumType.STRING);
       assertThat(true).isFalse().as("never get here");
     } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
     }
   }
 
@@ -90,7 +90,7 @@ public void enumDayOfWeek_builtIn_overrideAsString() {
       typeManager.enumType(DayOfWeek.class, EnumType.ORDINAL);
       assertThat(true).isFalse().as("never get here");
     } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
     }
   }
 
@@ -105,7 +105,7 @@ public void enumDayOfWeek_builtIn_overrideAsOrdinal() {
       typeManager.enumType(DayOfWeek.class, EnumType.STRING);
       assertThat(true).isFalse().as("never get here");
     } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
     }
   }
 
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
index f99991ebd9..ac94509cca 100644
--- a/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/TestTypeManager.java
@@ -57,7 +57,7 @@ void testEnumWithSubclasses() throws SQLException {
       typeManager.enumType(MyEnum.class, EnumType.STRING);
       fail("never get here");
     } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
     }
   }
 
@@ -91,7 +91,7 @@ void testEnumWithChar() throws SQLException {
       typeManager.enumType(MyDayOfWeek.class, EnumType.ORDINAL);
       fail("never get here");
     } catch (IllegalStateException e) {
-      assertThat(e.getMessage()).contains("It is mapped using 2 different modes when only one is supported");
+      assertThat(e.getMessage()).contains("It is mapped using 2 of (ORDINAL, STRING or an Ebean mapping) when only one is supported.");
     }
   }