diff --git a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/mapped_by_id/LoadGraphFindByIdTest.java b/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/mapped_by_id/LoadGraphFindByIdTest.java
index d654cce179..2f160233d7 100644
--- a/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/mapped_by_id/LoadGraphFindByIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/jpa/test/graphs/mapped_by_id/LoadGraphFindByIdTest.java
@@ -15,6 +15,7 @@
 import javax.persistence.Id;
 import javax.persistence.MapsId;
 import javax.persistence.OneToOne;
+import javax.persistence.Table;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
@@ -111,7 +112,8 @@ public static class UserStatistic {
 		private Integer commentCount;
 	}
 
-	@Entity(name = "Users")
+	@Entity(name = "User")
+	@Table(name = "USERS")
 	public static class User {
 
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/LazyInCacheTestTask.java b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/LazyInCacheTestTask.java
index baf9e3cc49..3ffe8f2c3a 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/LazyInCacheTestTask.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/bytecode/enhancement/lazy/cache/LazyInCacheTestTask.java
@@ -24,6 +24,7 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.OneToMany;
+import javax.persistence.Table;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -66,7 +67,8 @@ public void execute() {
 	protected void cleanup() {
 	}
 
-	@Entity(name = "Orders")
+	@Entity(name = "Order")
+	@Table(name = "ORDERS")
 	@Cache( usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE )
 	public static class Order {
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/hql/CoalesceTest.java b/hibernate-core/src/test/java/org/hibernate/test/hql/CoalesceTest.java
index 957f2089af..3903664a3e 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/hql/CoalesceTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/hql/CoalesceTest.java
@@ -12,6 +12,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
+import org.hibernate.dialect.Oracle8iDialect;
 import org.hibernate.dialect.PostgreSQL81Dialect;
 import org.hibernate.query.Query;
 
@@ -64,6 +65,7 @@ public void HHH_10463_TestCoalesce() {
     
     @Test
     @SkipForDialect( jiraKey = "HHH-10463", value =  PostgreSQL81Dialect.class)
+    @SkipForDialect( jiraKey = "HHH-10463", value =  Oracle8iDialect.class)
     public void HHH_10463_NullInCoalesce() {
         doInHibernate( this::sessionFactory, session -> {
             Query query = session.createQuery("from Person p where p.name = coalesce(:name, p.name) ");
diff --git a/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/cache/ExtendedEntity.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/cache/ExtendedEntity.java
index d15f207a2e..132a408f83 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/cache/ExtendedEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/cache/ExtendedEntity.java
@@ -8,10 +8,8 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Table;
 
 @Entity
-@Table
 public class ExtendedEntity extends MyEntity {
 	public ExtendedEntity() {
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/cache/MyEntity.java b/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/cache/MyEntity.java
index 264972abbc..a10a30739b 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/cache/MyEntity.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/naturalid/inheritance/cache/MyEntity.java
@@ -11,7 +11,6 @@
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import javax.persistence.Table;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -19,7 +18,6 @@
 import org.hibernate.annotations.NaturalId;
 
 @Entity
-@Table
 @Cacheable
 @Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
 public class MyEntity {
@@ -45,7 +43,7 @@ public void setId(Long id) {
 	}
 
 	@NaturalId
-	@Column
+	@Column(name = "natural_id")
 	public String getUid() {
 		return uid;
 	}
diff --git a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java
index 3685174361..8096a9f10f 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/schemaupdate/foreignkeys/definition/ForeignKeyDefinitionSecondaryTableTest.java
@@ -12,6 +12,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.SecondaryTable;
+import javax.persistence.Table;
 
 import org.hibernate.dialect.H2Dialect;
 
@@ -31,7 +32,8 @@ protected Class<?>[] getAnnotatedClasses() {
 		};
 	}
 
-	@Entity(name = "Users")
+	@Entity(name = "User")
+	@Table(name = "USERS")
 	@SecondaryTable(name = "User_details", foreignKey = @ForeignKey(name = "secondary", foreignKeyDefinition = "foreign key /* FK */ (id) references Users"))
 	public class User {