diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/LongVarcharValidationTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/LongVarcharValidationTest.java
index 1d6d27d2dd..859bde3a2a 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/LongVarcharValidationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/schemavalidation/LongVarcharValidationTest.java
@@ -62,7 +62,7 @@ public class LongVarcharValidationTest extends BaseUnitTestCase {
 		}
 	}
 
-	@Entity
+	@Entity(name = "Translation")
 	public static class Translation {
 		@Id
 		public Integer id;
diff --git a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/EntitySuperclassCollectionTest.java b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/EntitySuperclassCollectionTest.java
index ed1cc3e9b7..abadfa0ddc 100644
--- a/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/EntitySuperclassCollectionTest.java
+++ b/hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/EntitySuperclassCollectionTest.java
@@ -8,14 +8,7 @@ package org.hibernate.jpa.test.criteria;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.EntityManager;
-import javax.persistence.EntityTransaction;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.TypedQuery;
+import javax.persistence.*;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Root;
@@ -98,7 +91,7 @@ public class EntitySuperclassCollectionTest extends BaseEntityManagerFunctionalT
 		}
 	}
 
-	@Entity
+	@Entity(name = "PersonBase")
 	public abstract static class PersonBase {
 		@Id
 		@GeneratedValue