diff --git a/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java b/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java
index 582f77300..5d9c1aeee 100644
--- a/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java
+++ b/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBean.java
@@ -10,7 +10,7 @@ import java.util.List;
  */
 @Cache
 @Entity
-@Table(name = "l2_cached_lazy_dirt_flag_reset_bean")
+@Table(name = "l2_cldf_reset_bean")
 public class L2CachedLazyDirtFlagResetBean {
 
   public Long getId() {
diff --git a/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java b/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java
index 664263848..4aaf5e2ca 100644
--- a/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java
+++ b/src/test/java/org/tests/model/basic/L2CachedLazyDirtFlagResetBeanChild.java
@@ -3,7 +3,7 @@ package org.tests.model.basic;
 import javax.persistence.*;
 
 @Entity
-@Table(name = "l2_cached_lazy_dirt_flag_reset_bean_child")
+@Table(name = "l2_cldf_reset_bean_child")
 public class L2CachedLazyDirtFlagResetBeanChild {
 
   @Id
diff --git a/src/test/java/org/tests/model/history/HeLink.java b/src/test/java/org/tests/model/history/HeLink.java
index 251b2385e..449bca72d 100644
--- a/src/test/java/org/tests/model/history/HeLink.java
+++ b/src/test/java/org/tests/model/history/HeLink.java
@@ -6,10 +6,13 @@ import org.tests.model.draftable.BaseDomain;
 
 import javax.persistence.Entity;
 import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+
 import java.util.List;
 
 @History
 @Entity
+@Table(name = "hx_link")
 public class HeLink extends BaseDomain {
 
   String name;