diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoAnnotationProcessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoAnnotationProcessor.java
index 951c34217..9455d4e7f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoAnnotationProcessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoAnnotationProcessor.java
@@ -27,10 +27,11 @@ import javax.lang.model.SourceVersion;
 import javax.lang.model.element.TypeElement;
 import javax.tools.Diagnostic;
 
+import org.springframework.data.document.mongodb.mapping.Document;
+
 import com.mysema.query.annotations.QueryEmbeddable;
 import com.mysema.query.annotations.QueryEmbedded;
 import com.mysema.query.annotations.QueryEntities;
-import com.mysema.query.annotations.QueryEntity;
 import com.mysema.query.annotations.QuerySupertype;
 import com.mysema.query.annotations.QueryTransient;
 import com.mysema.query.apt.DefaultConfiguration;
@@ -60,7 +61,7 @@ public class MongoAnnotationProcessor extends AbstractProcessor {
         DefaultConfiguration configuration =
                 new DefaultConfiguration(roundEnv, processingEnv.getOptions(),
                         Collections.<String> emptySet(), QueryEntities.class,
-                        QueryEntity.class, QuerySupertype.class,
+                        Document.class, QuerySupertype.class,
                         QueryEmbeddable.class, QueryEmbedded.class,
                         QueryTransient.class);
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/Person.java b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/Person.java
index 2416f61b7..e26460bda 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/Person.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/Person.java
@@ -18,8 +18,7 @@ package org.springframework.data.document.mongodb.repository;
 import java.util.Set;
 
 import org.bson.types.ObjectId;
-
-import com.mysema.query.annotations.QueryEntity;
+import org.springframework.data.document.mongodb.mapping.Document;
 
 
 /**
@@ -27,7 +26,7 @@ import com.mysema.query.annotations.QueryEntity;
  *
  * @author Oliver Gierke
  */
-@QueryEntity
+@Document
 public class Person {
 
   private String id;