diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java
index 8f524847a..affad102c 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/core/support/DefaultRepositoryInformation.java
@@ -31,6 +31,7 @@ import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 /**
  * Default implementation of {@link RepositoryInformation}.
@@ -155,6 +156,7 @@ class DefaultRepositoryInformation extends AbstractRepositoryMetadata implements
 		Set<Method> result = new HashSet<Method>();
 
 		for (Method method : getRepositoryInterface().getMethods()) {
+			method = ClassUtils.getMostSpecificMethod(method, getRepositoryInterface());
 			if (!isCustomMethod(method) && !isBaseClassMethod(method)) {
 				result.add(method);
 			}
diff --git a/spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java b/spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java
index fb4b43987..51b8c6f72 100644
--- a/spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java
+++ b/spring-data-commons-core/src/test/java/org/springframework/data/repository/core/support/DefaultRepositoryInformationUnitTests.java
@@ -8,7 +8,6 @@ import java.lang.reflect.Method;
 import java.util.List;
 
 import org.hamcrest.Matcher;
-import org.hamcrest.Matchers;
 import org.hamcrest.collection.IsEmptyIterable;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -126,7 +125,21 @@ public class DefaultRepositoryInformationUnitTests {
 
 		assertThat(queryMethods, not(hasItem(saveMethod)));
 		assertThat(queryMethods, not(hasItem(deleteMethod)));
-		assertThat(queryMethods, is(Matchers.<Method> iterableWithSize(2)));
+	}
+
+	@Test
+	public void onlyReturnsMostConcreteQueryMethod() throws Exception {
+
+		RepositoryMetadata metadata = new DefaultRepositoryMetadata(ConcreteRepository.class);
+		RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, null);
+
+		Method intermediateMethod = BaseRepository.class.getMethod("genericMethodToOverride", String.class);
+		Method concreteMethod = ConcreteRepository.class.getMethod("genericMethodToOverride", String.class);
+
+		Iterable<Method> queryMethods = information.getQueryMethods();
+
+		assertThat(queryMethods, hasItem(concreteMethod));
+		assertThat(queryMethods, not(hasItem(intermediateMethod)));
 	}
 
 	private Method getMethodFrom(Class<?> type, String name) {
@@ -167,6 +180,8 @@ public class DefaultRepositoryInformationUnitTests {
 
 		S findBySomething(String something);
 
+		S genericMethodToOverride(String something);
+
 		<K extends S> K save(K entity);
 
 		void delete(S entity);
@@ -175,6 +190,8 @@ public class DefaultRepositoryInformationUnitTests {
 	interface ConcreteRepository extends BaseRepository<User, Integer> {
 
 		User findBySomethingDifferent(String somethingDifferent);
+
+		User genericMethodToOverride(String something);
 	}
 
 	interface ReadOnlyRepository<T, ID extends Serializable> extends Repository<T, ID> {