diff --git a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java
index 5eb3f79e1..1afe9d832 100644
--- a/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java
+++ b/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsUnitTests.java
@@ -115,11 +115,6 @@ public class QueryUtilsUnitTests {
 		assertThat(detectAlias("select u from  User u"), IS_U);
 		assertThat(detectAlias("select u from  com.acme.User u"), IS_U);
 		assertThat(detectAlias("select u from T05User u"), IS_U);
-		assertThat(detectAlias("select * from User group by name"), isEmptyOrNullString());
-		assertThat(detectAlias("select * from User order by name"), isEmptyOrNullString());
-		assertThat(detectAlias("select * from User u group by name"), IS_U);
-		assertThat(detectAlias("select * from User u order by name"), IS_U);
-
 	}
 
 	@Test
@@ -409,6 +404,15 @@ public class QueryUtilsUnitTests {
 						.contains("myAlias");
 	}
 
+	@Test // DATAJPA-1506
+	public void detectsAliasWithGroupAndOrderBy() {
+
+		assertThat(detectAlias("select * from User group by name")).isNull();
+		assertThat(detectAlias("select * from User order by name")).isNull();
+		assertThat(detectAlias("select * from User u group by name")).isEqualTo("u");
+		assertThat(detectAlias("select * from User u order by name")).isEqualTo("u");
+	}
+
 	private static void assertCountQuery(String originalQuery, String countQuery) {
 		assertThat(createCountQueryFor(originalQuery), is(countQuery));
 	}