diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java
index 7a213d4f9..0393017ea 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachA.java
@@ -43,7 +43,7 @@ import org.apache.openjpa.persistence.FetchGroups;
 @FetchAttribute(name = "attachEArray", recursionDepth = 0)
     })
     })
-@Table(name="K_AttachA")
+@Table(name="K_ATTACHA")
 public class AttachA implements Serializable {
 
     @Id
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java
index 2923164e2..13bf493d2 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachD.java
@@ -35,6 +35,7 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 import org.apache.openjpa.persistence.jdbc.KeyColumn;
 import org.apache.openjpa.persistence.FetchAttribute;
@@ -51,9 +52,9 @@ import org.apache.openjpa.persistence.jdbc.KeyColumn;
 @FetchAttribute(name = "bigIntegerPCMap", recursionDepth = 0),
 @FetchAttribute(name = "embeddedE", recursionDepth = 0),
 @FetchAttribute(name = "embeddedA", recursionDepth = 0)
-
     })
     })
+@Table(name="K_ATTACHD")
 public class AttachD implements Serializable {
 
     @Id
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java
index 279163ab5..4e37ee487 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachE.java
@@ -47,7 +47,7 @@ import org.apache.openjpa.persistence.FetchGroups;
 @FetchAttribute(name = "f")
     })
     })
-@Table(name="K_AttachE")
+@Table(name="K_ATTACHE")
 public class AttachE implements Serializable {
 
     @Id
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java
index 9da171e9a..f71bc5031 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/kernel/common/apps/AttachF.java
@@ -30,6 +30,7 @@ import javax.persistence.Id;
 import javax.persistence.IdClass;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 
 import org.apache.openjpa.persistence.FetchAttribute;
 import org.apache.openjpa.persistence.FetchGroup;
@@ -46,6 +47,7 @@ import org.apache.openjpa.persistence.PersistentCollection;
 @FetchAttribute(name = "embeddedC", recursionDepth = 0)
     })
     })
+@Table(name="K_ATTACHF")
 public class AttachF implements Serializable {
 
     @Id