diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java
index ff6843b9b9..1a356b0c7e 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics2Test.java
@@ -78,7 +78,7 @@ public class EnumeratedAndGenerics2Test {
 		}
 	}
 
-	@Entity
+	@Entity(name="TestEntity")
 	public static class TestEntity extends GenericBaseEntity<TestEnum> {
 
 		@Id
@@ -93,7 +93,7 @@ public class EnumeratedAndGenerics2Test {
 
 	}
 
-	@Entity
+	@Entity(name="AnotherTestEntity")
 	public static class AnotherTestEntity extends GenericBaseEntity<AnotherTestEnum> {
 
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java
index e97a99920a..f75ddad9b8 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenerics3Test.java
@@ -67,7 +67,7 @@ public class EnumeratedAndGenerics3Test {
 		}
 	}
 
-	@Entity
+	@Entity(name="TestEntity")
 	public static class TestEntity extends GenericBaseEntity<TestEnum> {
 
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java
index 77352afd7e..5de0ee1218 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/enumerated/EnumeratedAndGenericsTest.java
@@ -78,7 +78,7 @@ public class EnumeratedAndGenericsTest {
 		}
 	}
 
-	@Entity
+	@Entity(name="TestEntity")
 	public static class TestEntity extends GenericBaseEntity<TestEnum> {
 
 		@Id
@@ -93,7 +93,7 @@ public class EnumeratedAndGenericsTest {
 
 	}
 
-	@Entity
+	@Entity(name="AnotherTestEntity")
 	public static class AnotherTestEntity extends GenericBaseEntity<AnotherTestEnum> {
 
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedJoinedSuperclassColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedJoinedSuperclassColumnTest.java
index 18724112b3..9b6ad664fb 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedJoinedSuperclassColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedJoinedSuperclassColumnTest.java
@@ -68,7 +68,7 @@ public class ReferencedJoinedSuperclassColumnTest {
 	@DiscriminatorColumn(name = "branch_type", discriminatorType = DiscriminatorType.STRING)
 	public static class Branch {
 		@Id
-		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		@GeneratedValue
 		Long id;
 
 		@Column(unique = true, name = "branch_id")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedSuperclassColumnTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedSuperclassColumnTest.java
index 43a83c81b0..8ae50b5004 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedSuperclassColumnTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/refcolnames/superclass/ReferencedSuperclassColumnTest.java
@@ -54,7 +54,7 @@ public class ReferencedSuperclassColumnTest {
 	@DiscriminatorColumn(name = "branch_type", discriminatorType = DiscriminatorType.STRING)
 	public static class Branch {
 		@Id
-		@GeneratedValue(strategy = GenerationType.IDENTITY)
+		@GeneratedValue
 		Long id;
 
 		@Column(unique = true, name = "branch_id")
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/PostgresUuidTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/PostgresUuidTest.java
index c9ef53cd2b..f2444dd9a7 100644
--- a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/PostgresUuidTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/generated/sqldefault/PostgresUuidTest.java
@@ -16,7 +16,7 @@ import java.util.UUID;
 
 @SessionFactory
 @DomainModel(annotatedClasses = PostgresUuidTest.It.class)
-@RequiresDialect(PostgreSQLDialect.class)
+@RequiresDialect(value = PostgreSQLDialect.class, majorVersion = 13)
 public class PostgresUuidTest {
 
 	@Test