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 a50f5b148..580586abe 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
@@ -27,7 +27,6 @@ import com.mysema.query.Domain1;
 import com.mysema.query.Domain1Dtos;
 import com.mysema.query.Domain1.Catalog;
 import com.mysema.query.grammar.HqlGrammar;
-import com.mysema.query.grammar.HqlQueryBase;
 import com.mysema.query.grammar.JoinMeta;
 import com.mysema.query.grammar.hql.HqlDomain.Color;
 import com.mysema.query.grammar.hql.HqlDomain.DomesticCat;
@@ -41,7 +40,7 @@ import com.mysema.query.grammar.hql.HqlDomain.Payment;
  * @author tiwe
  * @version $Id$
  */
-public class HqlParserTest extends HqlQueryBase<HqlParserTest> implements Domain1Instances{
+public class HqlParserTest extends QueryBaseWithDomain<HqlParserTest> {
     
     /**
      * Section 9.2 - from *
diff --git a/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/Domain1Instances.java b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/QueryBaseWithDomain.java
similarity index 84%
rename from querydsl-hql/src/test/java/com/mysema/query/grammar/hql/Domain1Instances.java
rename to querydsl-hql/src/test/java/com/mysema/query/grammar/hql/QueryBaseWithDomain.java
index 55664b98f..ef9787f41 100644
--- a/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/Domain1Instances.java
+++ b/querydsl-hql/src/test/java/com/mysema/query/grammar/hql/QueryBaseWithDomain.java
@@ -1,19 +1,16 @@
-/*
- * Copyright (c) 2008 Mysema Ltd.
- * All rights reserved.
- * 
- */
 package com.mysema.query.grammar.hql;
 
-import static com.mysema.query.Domain1.*;
+import com.mysema.query.Domain1.*;
+import com.mysema.query.grammar.HqlQueryBase;
 
 /**
- * Domain1Instances provides.
- * 
+ * QueryBaseWithDomain provides
+ *
  * @author tiwe
  * @version $Id$
  */
-public interface Domain1Instances {
+public abstract class QueryBaseWithDomain<A extends QueryBaseWithDomain<A>> 
+    extends HqlQueryBase<A>{
     
     Account account = new Account("account");