diff --git a/querydsl-apt/src/test/java/com/mysema/query/apt/GenericExporterTest.java b/querydsl-apt/src/test/java/com/mysema/query/apt/GenericExporterTest.java
index 8591295f3..61e4e7d86 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/apt/GenericExporterTest.java
+++ b/querydsl-apt/src/test/java/com/mysema/query/apt/GenericExporterTest.java
@@ -97,6 +97,8 @@ public class GenericExporterTest extends AbstractProcessorTest{
         
         expected.add("QGeneric4Test_HidaBezGruppe.java");
         expected.add("QGeneric4Test_HidaBez.java");
+        expected.add("QGeneric6Test_Cycle1.java");
+        expected.add("QGeneric6Test_Cycle2.java");
         
         execute(expected, "GenericExporterTest2", "HibernateAnnotationProcessor");
     }
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic4Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic4Test.java
index ee5c3ceee..bb8de62b1 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic4Test.java
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic4Test.java
@@ -13,11 +13,13 @@ public class Generic4Test {
     
     @MappedSuperclass
     public static abstract class HidaBez<B extends HidaBez<B, G>, G extends HidaBezGruppe<G, B>> extends CapiBCKeyedByGrundstueck {
+        
     }
 
     @MappedSuperclass
     public static abstract class HidaBezGruppe<G extends HidaBezGruppe<G, B>, B extends HidaBez<B, G>> extends
             CapiBCKeyedByGrundstueck {
+        
     }
     
     @Test
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic5Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic5Test.java
new file mode 100644
index 000000000..45f40be89
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic5Test.java
@@ -0,0 +1,40 @@
+package com.mysema.query.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
+
+import org.junit.Test;
+
+public class Generic5Test {
+    
+    @MappedSuperclass
+    public static class Base<B extends Base<B>> {
+        
+    }
+    
+    @Entity
+    public static class Entity1<T extends Entity1<T>> {
+        
+    }
+    
+    @Entity
+    public static class Entity2 extends Entity1<Entity2> {
+        
+    }
+    
+    @Entity
+    public static class Entity3<T extends Entity3<T>> extends Base<T> {
+        
+    }
+    
+    @Entity
+    public static class Entity4 extends Entity3<Entity4> {
+        
+    }
+        
+    @Test
+    public void test() {
+        
+    }
+
+}
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic6Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic6Test.java
new file mode 100644
index 000000000..01d278770
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic6Test.java
@@ -0,0 +1,29 @@
+package com.mysema.query.domain;
+
+import javax.persistence.Entity;
+
+import org.junit.Test;
+
+public class Generic6Test {
+
+    @Entity
+    public static class Cycle2<T extends Cycle1<?,?>> {
+        
+    }
+    
+    @Entity
+    public static class Cycle1<U extends Comparable<U>, T extends Cycle2<?>> implements Comparable<Cycle1<U, T>> {
+
+        @Override
+        public int compareTo(Cycle1<U, T> o) {
+            return 0;
+        }
+        
+    }
+    
+    @Test
+    public void test() {
+    
+    }
+    
+}