diff --git a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java
index 8cad04872..1d5fea671 100644
--- a/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java
+++ b/src/main/java/org/springframework/data/jpa/repository/query/JpaQueryCreator.java
@@ -63,7 +63,7 @@ public class JpaQueryCreator extends
         super(tree, parameters);
 
         this.builder = em.getCriteriaBuilder();
-        this.query = builder.createQuery();
+        this.query = builder.createQuery().distinct(tree.isDistinct());
         this.root = query.from(domainClass);
     }
 
diff --git a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
index 3f8aa8612..8020af241 100644
--- a/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java
@@ -592,6 +592,7 @@ public class UserRepositoryTests {
 
         List<User> result =
                 repository.findByLastnameLikeOrderByFirstnameDesc("%r%");
+        assertThat(result.size(), is(2));
         assertEquals(firstUser, result.get(0));
         assertEquals(secondUser, result.get(1));
     }