diff --git a/querydsl-apt/pom.xml b/querydsl-apt/pom.xml
index 994ae60bb..4ebf8c7a2 100644
--- a/querydsl-apt/pom.xml
+++ b/querydsl-apt/pom.xml
@@ -15,7 +15,8 @@
   <description>APT based Source code generation for Querydsl</description>
   <packaging>jar</packaging>
 
-  <properties>
+  <properties>
+    <hibernate.version>4.1.7.Final</hibernate.version>
     <jdo.version>2.3-eb</jdo.version>
     <morphia.version>0.99</morphia.version>
   </properties>
@@ -57,9 +58,15 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>3.6.1.Final</version>
+      <version>${hibernate.version}</version>
       <scope>test</scope>
-    </dependency>  
+    </dependency>  
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-envers</artifactId>
+      <version>${hibernate.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>com.mysema.querydsl</groupId>
       <artifactId>querydsl-core</artifactId>
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Revision.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Revision.java
new file mode 100644
index 000000000..cb2e22fb4
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Revision.java
@@ -0,0 +1,13 @@
+package com.mysema.query.domain;
+import javax.persistence.Entity;
+
+import org.hibernate.envers.DefaultRevisionEntity;
+import org.hibernate.envers.RevisionEntity;
+
+@Entity
+@RevisionEntity
+public class Revision extends DefaultRevisionEntity {
+
+    private static final long serialVersionUID = 4587663183059799464L;
+
+}
\ No newline at end of file
diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/package-info.java b/querydsl-apt/src/test/java/com/mysema/query/domain/package-info.java
index 5143c98c1..070b247dd 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/package-info.java
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/package-info.java
@@ -1,5 +1,7 @@
-@QueryEntities({A.class, Tenant.class})
+@QueryEntities({A.class, Tenant.class, DefaultRevisionEntity.class})
 package com.mysema.query.domain;
 
-import com.mysema.query.annotations.*;
+import org.hibernate.envers.DefaultRevisionEntity;
+
+import com.mysema.query.annotations.QueryEntities;