diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/NestedIdClassTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/NestedIdClassTests.java
index 3b388f0550..b12a413bfa 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/NestedIdClassTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/idclass/NestedIdClassTests.java
@@ -44,8 +44,8 @@ public class NestedIdClassTests {
 	@Test
 	public void testHqlIdAttributeReference(SessionFactoryScope scope) {
 		scope.inTransaction( (session) -> {
-			session.createQuery( "from Payment p where p.order.orderNumber = '123'" ).list();
-			session.createQuery( "from Payment p where p.id.order.orderNumber = '123'" ).list();
+			session.createQuery( "from Payment p where p.order.orderNumber = 123" ).list();
+			session.createQuery( "from Payment p where p.id.order.orderNumber = 123" ).list();
 		});
 	}
 
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java
index 86fc403008..8d71604469 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/cid/nonaggregated/SmokeTests.java
@@ -87,6 +87,7 @@ public class SmokeTests {
 		private String accessCode;
 
 		@Id
+		@Column(name = "system_id")
 		public String getSystem() {
 			return system;
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Name.java
index 0bc5f7051c..168b7dd9c4 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embeddable/Name.java
@@ -8,11 +8,15 @@ package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embeddab
 
 import org.hibernate.annotations.EmbeddableInstantiator;
 
+import jakarta.persistence.Column;
+
 
 //tag::embeddable-instantiator-class[]
 @EmbeddableInstantiator( NameInstantiator.class )
 public class Name {
+	@Column(name = "first_name")
 	private final String first;
+	@Column(name = "last_name")
 	private final String last;
 
 	private Name() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Name.java
index d3f3a424de..42a3bc4ec0 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/embedded/Name.java
@@ -6,9 +6,13 @@
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.embedded;
 
+import jakarta.persistence.Column;
+
 //tag::embeddable-instantiator-property[]
 public class Name {
+	@Column(name = "first_name")
 	private final String first;
+	@Column(name = "last_name")
 	private final String last;
 
 	private Name() {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Name.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Name.java
index 23e5b8b99d..bd150219e9 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Name.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/embeddable/strategy/instantiator/registered/Name.java
@@ -6,9 +6,13 @@
  */
 package org.hibernate.orm.test.mapping.embeddable.strategy.instantiator.registered;
 
+import jakarta.persistence.Column;
+
 //tag::embeddable-instantiator-registration[]
 public class Name {
+	@Column(name = "first_name")
 	private final String first;
+	@Column(name = "last_name")
 	private final String last;
 
 	private Name() {