diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java
index c9df73c737..df90dc8d0e 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/collections/mappedsuperclasselement/MappedSuperclassComponentSetTestEntity.java
@@ -31,6 +31,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.Table;
 
 import org.hibernate.envers.Audited;
 import org.hibernate.envers.NotAudited;
@@ -39,6 +40,7 @@ import org.hibernate.envers.NotAudited;
  * @author Adam Warski (adam at warski dot org)
  */
 @Entity
+@Table( name = "SupCompSetTestEntity")
 @Audited
 public class MappedSuperclassComponentSetTestEntity {
 	@Id
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java
index a6a09cf8c0..539c95ca65 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithDeclaredData.java
@@ -31,6 +31,7 @@ import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
@@ -38,6 +39,7 @@ import org.hibernate.envers.Audited;
  * @author Jakob Braeuchi.
  */
 @Entity
+@Table(name="EntEmbWDeclData")
 @Access(AccessType.FIELD)
 @Audited
 public class EntityWithEmbeddableWithDeclaredData {
diff --git a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java
index 045770760c..710bfbf7a7 100644
--- a/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java
+++ b/hibernate-envers/src/test/java/org/hibernate/envers/test/integration/components/mappedsuperclass/EntityWithEmbeddableWithNoDeclaredData.java
@@ -31,6 +31,7 @@ import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
+import javax.persistence.Table;
 
 import org.hibernate.envers.Audited;
 
@@ -38,6 +39,7 @@ import org.hibernate.envers.Audited;
  * @author Jakob Braeuchi.
  */
 @Entity
+@Table(name="EntEmbWNoDeclData")
 @Access(AccessType.FIELD)
 @Audited
 public class EntityWithEmbeddableWithNoDeclaredData {
diff --git a/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapSanityCheck.hbm.xml b/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapSanityCheck.hbm.xml
index 12f59e30b8..3ef9cc9795 100644
--- a/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapSanityCheck.hbm.xml
+++ b/hibernate-envers/src/test/resources/mappings/dynamicComponents/mapSanityCheck.hbm.xml
@@ -4,7 +4,7 @@
         "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
 <hibernate-mapping default-lazy="false">
     <!-- shortened table name for Oracle -->
-    <class name="org.hibernate.envers.test.integration.components.dynamic.PlainEntity" table="Plain_entity">
+    <class name="org.hibernate.envers.test.integration.components.dynamic.PlainEntity" table="PEntity">
         <id name="id" type="long" column="id"/>
         <property name="note" type="string"/>
         <component name="component" class="org.hibernate.envers.test.integration.components.dynamic.PlainComponent">