diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/MultiTypedBasicAttributesEntity.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/MultiTypedBasicAttributesEntity.java
index dfb646d0cb..4a33ee0ae2 100644
--- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/MultiTypedBasicAttributesEntity.java
+++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/criteria/MultiTypedBasicAttributesEntity.java
@@ -26,6 +26,7 @@ package org.hibernate.ejb.criteria;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.hibernate.annotations.GenericGenerator;
 
@@ -36,6 +37,7 @@ import org.hibernate.annotations.GenericGenerator;
  * @author Steve Ebersole
  */
 @Entity
+@Table(name="ENT_W_MANY_COLS")
 public class MultiTypedBasicAttributesEntity {
 	@Id
 	@GeneratedValue( generator = "increment" )
diff --git a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/query/QueryTest.java b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/query/QueryTest.java
index 3dccf99256..5b429bf8c9 100644
--- a/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/query/QueryTest.java
+++ b/hibernate-entitymanager/src/matrix/java/org/hibernate/ejb/test/query/QueryTest.java
@@ -32,8 +32,6 @@ import java.util.Date;
 import java.util.List;
 
 import org.hibernate.Hibernate;
-import org.hibernate.criterion.CriteriaQuery;
-import org.hibernate.ejb.criteria.MultiTypedBasicAttributesEntity;
 import org.hibernate.ejb.test.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.ejb.test.Distributor;
 import org.hibernate.ejb.test.Item;
@@ -573,8 +571,7 @@ public class QueryTest extends BaseEntityManagerFunctionalTestCase {
 		return new Class[]{
 				Item.class,
 				Distributor.class,
-				Wallet.class,
-				MultiTypedBasicAttributesEntity.class
+				Wallet.class
 		};
 	}
 }