diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLLoaderTest.java b/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLLoaderTest.java
index 2348c3eddb4e..a558112c9872 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLLoaderTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/legacy/SQLLoaderTest.java
@@ -71,7 +71,7 @@ public void testTS() throws Exception {
 		Simple sim = new Simple( Long.valueOf(1) );
 		sim.setDate( new Date() );
 		session.save( sim );
-		Query q = session.createSQLQuery( "select {sim.*} from Simple {sim} where {sim}.date_ = ?" ).addEntity( "sim", Simple.class );
+		Query q = session.createSQLQuery( "select {sim.*} from SimpleEntity {sim} where {sim}.date_ = ?" ).addEntity( "sim", Simple.class );
 		q.setTimestamp( 0, sim.getDate() );
 		assertTrue ( q.list().size()==1 );
 		session.delete(sim);
@@ -112,7 +112,7 @@ public void testFindBySQLStar() throws HibernateException, SQLException {
 		session.flush();
 
 		session.createSQLQuery( "select {category.*} from category {category}" ).addEntity( "category", Category.class ).list();
-		session.createSQLQuery( "select {simple.*} from Simple {simple}" ).addEntity( "simple", Simple.class ).list();
+		session.createSQLQuery( "select {simple.*} from SimpleEntity {simple}" ).addEntity( "simple", Simple.class ).list();
 		session.createSQLQuery( "select {a.*} from TA {a}" ).addEntity( "a", A.class ).list();
 
 		session.getTransaction().commit();
diff --git a/hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.hbm.xml b/hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.hbm.xml
index c1f617ff1bc6..6b07f0b1fb56 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.hbm.xml
+++ b/hibernate-core/src/test/java/org/hibernate/test/legacy/Simple.hbm.xml
@@ -10,7 +10,7 @@
 	"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
 
-    <class name="org.hibernate.test.legacy.Simple">
+    <class name="org.hibernate.test.legacy.Simple" table="SimpleEntity">
         <id name="id" type="long" column="id_">
             <generator class="assigned"/>
         </id>