diff --git a/querydsl-hql/pom.xml b/querydsl-hql/pom.xml
index 44c7af8f4..28b0b7c2f 100644
--- a/querydsl-hql/pom.xml
+++ b/querydsl-hql/pom.xml
@@ -84,7 +84,7 @@
         <version>1.0.15</version>
         <executions>
           <execution>
-            <id>dummy-domain</id>
+            <id>dummy-domain-into-class</id>
             <phase>generate-test-sources</phase>
             <goals>
               <goal>testExecute</goal>
@@ -102,16 +102,47 @@
               <nocompile>true</nocompile>
               <A>
                 -Ainclude=src/test/includes/instances.txt,
-                -AdestClass=com.mysema.query.Domain1,
-                -AdtoClass=com.mysema.query.Domain1Dtos
+                -AdestClass=com.mysema.query.domain1.Domain1,
+                -AdtoClass=com.mysema.query.domain1.Domain1Dtos
               </A>
               <testIncludes>
                 <testInclude>
                   com/mysema/query/grammar/hql/*.java
                 </testInclude>
               </testIncludes>
+              <showWarnings>true</showWarnings>
             </configuration>
           </execution>
+
+          <execution>
+            <id>dummy-domain-into-package</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>testExecute</goal>
+            </goals>
+            <configuration>
+              <aptSourceRoots>
+                <aptSourceRoot>src/test/java</aptSourceRoot>
+              </aptSourceRoots>
+              <force>true</force>
+              <fork>true</fork>
+              <factory>com.mysema.query.apt.APTFactory</factory>
+              <testGenerated>
+                target/generated-test-sources/java
+              </testGenerated>
+              <nocompile>true</nocompile>
+              <A>
+                -AnamePrefix=Q,
+                -AdestPackage=com.mysema.query.domain2
+              </A>
+              <testIncludes>
+                <testInclude>
+                  com/mysema/query/grammar/hql/*.java
+                </testInclude>
+              </testIncludes>
+              <showWarnings>true</showWarnings>
+            </configuration>
+          </execution>          
         </executions>
       </plugin>
     </plugins>
diff --git a/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java
index ce92ce708..376d44c9c 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/FeaturesTest.java
@@ -5,10 +5,10 @@
  */
 package com.mysema.query.grammar.hql;
 
-import static com.mysema.query.Domain1.cat;
-import static com.mysema.query.Domain1.catalog;
-import static com.mysema.query.Domain1.cust;
-import static com.mysema.query.Domain1.kitten;
+import static com.mysema.query.domain1.Domain1.cat;
+import static com.mysema.query.domain1.Domain1.catalog;
+import static com.mysema.query.domain1.Domain1.cust;
+import static com.mysema.query.domain1.Domain1.kitten;
 import static com.mysema.query.grammar.Grammar.add;
 import static com.mysema.query.grammar.Grammar.div;
 import static com.mysema.query.grammar.Grammar.mult;
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNull;
 import org.junit.Ignore;
 import org.junit.Test;
 
-import com.mysema.query.Domain1;
+import com.mysema.query.domain1.Domain1;
 import com.mysema.query.grammar.HqlGrammar;
 import com.mysema.query.grammar.HqlQueryBase;
 import com.mysema.query.grammar.HqlSerializer;
diff --git a/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java
index 580586abe..69f2a9512 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/HqlParserTest.java
@@ -23,9 +23,9 @@ import antlr.RecognitionException;
 import antlr.TokenStreamException;
 import antlr.collections.AST;
 
-import com.mysema.query.Domain1;
-import com.mysema.query.Domain1Dtos;
-import com.mysema.query.Domain1.Catalog;
+import com.mysema.query.domain1.Domain1;
+import com.mysema.query.domain1.Domain1Dtos;
+import com.mysema.query.domain1.Domain1.Catalog;
 import com.mysema.query.grammar.HqlGrammar;
 import com.mysema.query.grammar.JoinMeta;
 import com.mysema.query.grammar.hql.HqlDomain.Color;
diff --git a/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/QueryBaseWithDomain.java b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/QueryBaseWithDomain.java
index c052d4483..d92753c11 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/QueryBaseWithDomain.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/QueryBaseWithDomain.java
@@ -5,7 +5,7 @@
  */
 package com.mysema.query.grammar.hql;
 
-import com.mysema.query.Domain1.*;
+import com.mysema.query.domain1.Domain1.*;
 import com.mysema.query.grammar.HqlQueryBase;
 
 /**