diff --git a/querydsl-hql/src/test/java/com/mysema/query/DerbyJPAStandardTest.java b/querydsl-hql/src/test/java/com/mysema/query/DerbyJPAStandardTest.java
index 9de1b02fd..245dc6821 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/DerbyJPAStandardTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/DerbyJPAStandardTest.java
@@ -7,6 +7,9 @@ package com.mysema.query;
 
 import org.junit.runner.RunWith;
 
+import com.mysema.testutil.JPAConfig;
+import com.mysema.testutil.JPATestRunner;
+
 
 
 /**
diff --git a/querydsl-hql/src/test/java/com/mysema/query/DerbyStandardTest.java b/querydsl-hql/src/test/java/com/mysema/query/DerbyStandardTest.java
index 849bb443f..acf1fd1e0 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/DerbyStandardTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/DerbyStandardTest.java
@@ -7,6 +7,9 @@ package com.mysema.query;
 
 import org.junit.runner.RunWith;
 
+import com.mysema.testutil.HibernateConfig;
+import com.mysema.testutil.HibernateTestRunner;
+
 
 
 /**
diff --git a/querydsl-hql/src/test/java/com/mysema/query/HSQLDBJPAStandardTest.java b/querydsl-hql/src/test/java/com/mysema/query/HSQLDBJPAStandardTest.java
index 3a8f61dc5..eccd56f83 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/HSQLDBJPAStandardTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/HSQLDBJPAStandardTest.java
@@ -7,6 +7,9 @@ package com.mysema.query;
 
 import org.junit.runner.RunWith;
 
+import com.mysema.testutil.JPAConfig;
+import com.mysema.testutil.JPATestRunner;
+
 
 
 /**
diff --git a/querydsl-hql/src/test/java/com/mysema/query/HSQLDBStandardTest.java b/querydsl-hql/src/test/java/com/mysema/query/HSQLDBStandardTest.java
index 5f6be7d2d..cad236eb4 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/HSQLDBStandardTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/HSQLDBStandardTest.java
@@ -7,6 +7,9 @@ package com.mysema.query;
 
 import org.junit.runner.RunWith;
 
+import com.mysema.testutil.HibernateConfig;
+import com.mysema.testutil.HibernateTestRunner;
+
 
 
 /**
diff --git a/querydsl-hql/src/test/java/com/mysema/query/MySQLJPAStandardTest.java b/querydsl-hql/src/test/java/com/mysema/query/MySQLJPAStandardTest.java
index 78aa26237..f118a48b2 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/MySQLJPAStandardTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/MySQLJPAStandardTest.java
@@ -7,6 +7,9 @@ package com.mysema.query;
 
 import org.junit.runner.RunWith;
 
+import com.mysema.testutil.HibernateConfig;
+import com.mysema.testutil.HibernateTestRunner;
+
 
 @RunWith(HibernateTestRunner.class)
 @HibernateConfig("mysql.properties")
diff --git a/querydsl-hql/src/test/java/com/mysema/query/MySQLStandardTest.java b/querydsl-hql/src/test/java/com/mysema/query/MySQLStandardTest.java
index d8088fc42..d32b667bf 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/MySQLStandardTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/MySQLStandardTest.java
@@ -7,6 +7,9 @@ package com.mysema.query;
 
 import org.junit.runner.RunWith;
 
+import com.mysema.testutil.HibernateConfig;
+import com.mysema.testutil.HibernateTestRunner;
+
 
 @RunWith(HibernateTestRunner.class)
 @HibernateConfig("mysql.properties")
diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/ParserTest.java b/querydsl-hql/src/test/java/com/mysema/query/hql/HQLExamplesTest.java
similarity index 97%
rename from querydsl-hql/src/test/java/com/mysema/query/hql/ParserTest.java
rename to querydsl-hql/src/test/java/com/mysema/query/hql/HQLExamplesTest.java
index 899b809c9..2d4be89fd 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/hql/ParserTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/hql/HQLExamplesTest.java
@@ -50,7 +50,7 @@ import com.mysema.query.types.expr.Expr;
  * @author tiwe
  * @version $Id$
  */
-public class ParserTest implements Constants {
+public class HQLExamplesTest implements Constants {
 
     protected TestQuery query() {
         return new TestQuery();
@@ -99,7 +99,9 @@ public class ParserTest implements Constants {
     @Test
     public void joins() throws RecognitionException, TokenStreamException{
         query().from(cat).join(cat.mate).select(cat).parse();
+        
         query().from(cat).innerJoin(cat.mate).select(cat).parse();
+        
         query().from(cat).leftJoin(cat.mate).select(cat).parse();
     }
 
diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/HibernateIntegrationTest.java b/querydsl-hql/src/test/java/com/mysema/query/hql/HibernateIntegrationTest.java
index 2fc356738..39f2c00bd 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/hql/HibernateIntegrationTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/hql/HibernateIntegrationTest.java
@@ -17,8 +17,6 @@ import org.junit.runner.RunWith;
 import antlr.RecognitionException;
 import antlr.TokenStreamException;
 
-import com.mysema.query.HibernateConfig;
-import com.mysema.query.HibernateTestRunner;
 import com.mysema.query.hql.domain.Cat;
 import com.mysema.query.hql.domain.QCat;
 import com.mysema.query.hql.hibernate.HibernateDeleteClause;
@@ -26,6 +24,8 @@ import com.mysema.query.hql.hibernate.HibernateQuery;
 import com.mysema.query.hql.hibernate.HibernateUpdateClause;
 import com.mysema.query.hql.hibernate.HibernateUtil;
 import com.mysema.query.types.path.PEntity;
+import com.mysema.testutil.HibernateConfig;
+import com.mysema.testutil.HibernateTestRunner;
 
 /**
  * HibernatePersistenceTest provides.
@@ -35,26 +35,21 @@ import com.mysema.query.types.path.PEntity;
  */
 @RunWith(HibernateTestRunner.class)
 @HibernateConfig("hsqldb.properties")
-public class HibernateIntegrationTest extends ParserTest {
+public class HibernateIntegrationTest extends HQLExamplesTest {
 
     private Session session;
 
     protected TestQuery query() {
         return new TestQuery() {
-            public void parse() throws RecognitionException,
-                    TokenStreamException {
+            public void parse() throws RecognitionException, TokenStreamException {
                 try {
                     System.out.println("query : " + toString().replace('\n', ' '));
-
-                    // create Query and execute it
                     Query query = session.createQuery(toString());
                     HibernateUtil.setConstants(query, getConstants());
-                    try {
-                        query.list();
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        throw new RuntimeException(e);
-                    }
+                    query.list();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    throw new RuntimeException(e);
                 } finally {
                     System.out.println();
                 }
diff --git a/querydsl-hql/src/test/java/com/mysema/query/hql/JPAIntegrationTest.java b/querydsl-hql/src/test/java/com/mysema/query/hql/JPAIntegrationTest.java
index 2e6dabae2..8826c0464 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/hql/JPAIntegrationTest.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/hql/JPAIntegrationTest.java
@@ -14,9 +14,9 @@ import org.junit.runner.RunWith;
 import antlr.RecognitionException;
 import antlr.TokenStreamException;
 
-import com.mysema.query.JPAConfig;
-import com.mysema.query.JPATestRunner;
 import com.mysema.query.hql.jpa.JPAUtil;
+import com.mysema.testutil.JPAConfig;
+import com.mysema.testutil.JPATestRunner;
 
 /**
  * HibernatePersistenceTest provides.
@@ -26,7 +26,7 @@ import com.mysema.query.hql.jpa.JPAUtil;
  */
 @RunWith(JPATestRunner.class)
 @JPAConfig("hsqldb")
-public class JPAIntegrationTest extends ParserTest {
+public class JPAIntegrationTest extends HQLExamplesTest {
 
     private EntityManager entityManager;
 
diff --git a/querydsl-hql/src/test/java/com/mysema/query/HibernateConfig.java b/querydsl-hql/src/test/java/com/mysema/testutil/HibernateConfig.java
similarity index 89%
rename from querydsl-hql/src/test/java/com/mysema/query/HibernateConfig.java
rename to querydsl-hql/src/test/java/com/mysema/testutil/HibernateConfig.java
index 5cdb27d27..2f9b6c734 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/HibernateConfig.java
+++ b/querydsl-hql/src/test/java/com/mysema/testutil/HibernateConfig.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  * 
  */
-package com.mysema.query;
+package com.mysema.testutil;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/querydsl-hql/src/test/java/com/mysema/query/HibernateTestRunner.java b/querydsl-hql/src/test/java/com/mysema/testutil/HibernateTestRunner.java
similarity index 95%
rename from querydsl-hql/src/test/java/com/mysema/query/HibernateTestRunner.java
rename to querydsl-hql/src/test/java/com/mysema/testutil/HibernateTestRunner.java
index 7b292ff10..8ebfda1b0 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/HibernateTestRunner.java
+++ b/querydsl-hql/src/test/java/com/mysema/testutil/HibernateTestRunner.java
@@ -3,9 +3,8 @@
  * All rights reserved.
  * 
  */
-package com.mysema.query;
+package com.mysema.testutil;
 
-import java.io.File;
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.Properties;
diff --git a/querydsl-hql/src/test/java/com/mysema/query/JPAConfig.java b/querydsl-hql/src/test/java/com/mysema/testutil/JPAConfig.java
similarity index 89%
rename from querydsl-hql/src/test/java/com/mysema/query/JPAConfig.java
rename to querydsl-hql/src/test/java/com/mysema/testutil/JPAConfig.java
index 66768c8c0..b36c7ced7 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/JPAConfig.java
+++ b/querydsl-hql/src/test/java/com/mysema/testutil/JPAConfig.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  * 
  */
-package com.mysema.query;
+package com.mysema.testutil;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/querydsl-hql/src/test/java/com/mysema/query/JPATestRunner.java b/querydsl-hql/src/test/java/com/mysema/testutil/JPATestRunner.java
similarity index 95%
rename from querydsl-hql/src/test/java/com/mysema/query/JPATestRunner.java
rename to querydsl-hql/src/test/java/com/mysema/testutil/JPATestRunner.java
index 52f2d9a3f..4c169ad13 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/JPATestRunner.java
+++ b/querydsl-hql/src/test/java/com/mysema/testutil/JPATestRunner.java
@@ -3,7 +3,7 @@
  * All rights reserved.
  * 
  */
-package com.mysema.query;
+package com.mysema.testutil;
 
 import java.lang.reflect.Method;
 
diff --git a/querydsl-hql/src/test/resources/com/mysema/query/derby.properties b/querydsl-hql/src/test/resources/com/mysema/testutil/derby.properties
similarity index 100%
rename from querydsl-hql/src/test/resources/com/mysema/query/derby.properties
rename to querydsl-hql/src/test/resources/com/mysema/testutil/derby.properties
diff --git a/querydsl-hql/src/test/resources/com/mysema/query/hsqldb.properties b/querydsl-hql/src/test/resources/com/mysema/testutil/hsqldb.properties
similarity index 100%
rename from querydsl-hql/src/test/resources/com/mysema/query/hsqldb.properties
rename to querydsl-hql/src/test/resources/com/mysema/testutil/hsqldb.properties
diff --git a/querydsl-hql/src/test/resources/com/mysema/query/mysql.properties b/querydsl-hql/src/test/resources/com/mysema/testutil/mysql.properties
similarity index 100%
rename from querydsl-hql/src/test/resources/com/mysema/query/mysql.properties
rename to querydsl-hql/src/test/resources/com/mysema/testutil/mysql.properties