diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
index 5ab470f649..95b6d19701 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/JoinedSubclassWithEmbeddableTest.java
@@ -50,7 +50,7 @@ protected Class<?>[] getAnnotatedClasses() {
 	@Test
 	public void testSelectFromEmbeddedField() {
 		doInHibernate( this::sessionFactory, session -> {
-			session.createNativeQuery( "select * from employee_embeddable_person_map" ).getResultList();
+			session.createNativeQuery( "select * from employee_emb_person_map" ).getResultList();
 		} );
 	}
 
@@ -140,20 +140,20 @@ public static class Contact implements Serializable {
 	public class EmployeeContact implements Serializable {
 
 		@ManyToOne
-		@JoinColumn(name = "employee_embeddable_alert_contact")
+		@JoinColumn(name = "employee_emb_alert_contact")
 		private Person alertContact;
 
 		@OneToMany
-		@JoinColumn(name = "employee_embeddable_alert_contact")
+		@JoinColumn(name = "employee_emb_alert_contact")
 		private Set<Employee> alerteeContacts = new HashSet<>();
 
 		@ManyToMany
 		@OrderColumn(name = "list_idx")
-		@JoinTable(name = "employee_embeddable_person_list")
+		@JoinTable(name = "employee_emb_person_list")
 		private List<Person> personList = new ArrayList<>();
 
 		@ManyToMany
-		@CollectionTable(name = "employee_embeddable_person_map")
+		@CollectionTable(name = "employee_emb_person_map")
 		@MapKeyColumn(name = "person_key", length = 20)
 		private Map<String, Person> personMap = new HashMap<>();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java
index f75b57d247..d49d742456 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/SingleTableWithEmbeddableTest.java
@@ -51,7 +51,7 @@ protected Class<?>[] getAnnotatedClasses() {
 	@Test
 	public void testSelectFromEmbeddedField() {
 		doInHibernate( this::sessionFactory, session -> {
-			session.createNativeQuery( "select * from employee_embeddable_person_map" ).getResultList();
+			session.createNativeQuery( "select * from employee_emb_person_map" ).getResultList();
 		} );
 	}
 
@@ -154,7 +154,7 @@ public class EmployeeContact implements Serializable {
 		private List<Person> personList = new ArrayList<>();
 
 		@ManyToMany
-		@CollectionTable(name = "employee_embeddable_person_map")
+		@CollectionTable(name = "employee_emb_person_map")
 		@MapKeyColumn(name = "person_key", length = 20)
 		private Map<String, Person> personMap = new HashMap<>();
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java
index 91b257531d..63251d8746 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/inheritance/discriminator/embeddable/TablePerClassWithEmbeddableTest.java
@@ -153,7 +153,7 @@ public class EmployeeContact implements Serializable {
 		private List<Person> personList = new ArrayList<>();
 
 		@ManyToMany
-		@CollectionTable(name = "employee_embeddable_person_map")
+		@CollectionTable(name = "employee_emb_person_map")
 		@MapKeyColumn(name = "person_key", length = 20)
 		private Map<String, Person> personMap = new HashMap<>();
 	}