diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Domain.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Domain.java
index 2ae6f241e..275c35205 100644
--- a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Domain.java
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain/Domain.java
@@ -20,6 +20,10 @@ import com.querydsl.jpa.domain4.BookID;
 import com.querydsl.jpa.domain4.BookMark;
 import com.querydsl.jpa.domain4.BookVersion;
 import com.querydsl.jpa.domain4.Library;
+import com.querydsl.jpa.domain5.MyEmbeddedAttribute;
+import com.querydsl.jpa.domain5.MyEntity;
+import com.querydsl.jpa.domain5.MyMappedSuperclass;
+import com.querydsl.jpa.domain5.MyOtherEntity;
 
 public final class Domain {
 
@@ -84,6 +88,11 @@ public final class Domain {
             BookID.class,
             BookMark.class,
             BookVersion.class,
-            Library.class
+            Library.class,
+
+            MyEmbeddedAttribute.class,
+            MyEntity.class,
+            MyMappedSuperclass.class,
+            MyOtherEntity.class
     );
 }
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEmbeddedAttribute.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEmbeddedAttribute.java
new file mode 100644
index 000000000..dd0215c46
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEmbeddedAttribute.java
@@ -0,0 +1,9 @@
+package com.querydsl.jpa.domain5;
+
+import javax.persistence.*;
+
+@Embeddable
+public class MyEmbeddedAttribute {
+    @ManyToOne
+    private MyOtherEntity attributeWithInitProblem;
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEntity.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEntity.java
new file mode 100644
index 000000000..cb3e786d6
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyEntity.java
@@ -0,0 +1,18 @@
+package com.querydsl.jpa.domain5;
+
+import javax.persistence.Embedded;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+import com.querydsl.core.annotations.QueryInit;
+
+@Entity
+public class MyEntity extends MyMappedSuperclass {
+
+    @Id
+    private int id;
+
+    @Embedded
+    @QueryInit("*")
+    private MyEmbeddedAttribute embeddedAttribute;
+}
\ No newline at end of file
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyMappedSuperclass.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyMappedSuperclass.java
new file mode 100644
index 000000000..d23b28495
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyMappedSuperclass.java
@@ -0,0 +1,8 @@
+package com.querydsl.jpa.domain5;
+
+import javax.persistence.MappedSuperclass;
+
+@MappedSuperclass
+public class MyMappedSuperclass {
+
+}
diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyOtherEntity.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyOtherEntity.java
new file mode 100644
index 000000000..3b47b32ff
--- /dev/null
+++ b/querydsl-jpa/src/test/java/com/querydsl/jpa/domain5/MyOtherEntity.java
@@ -0,0 +1,11 @@
+package com.querydsl.jpa.domain5;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class MyOtherEntity {
+
+    @Id
+    private int id;
+}