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 38f1cf1b9..8f524847a 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
@@ -292,7 +292,10 @@ class DefaultRepositoryInformation extends AbstractRepositoryMetadata implements
 			return true;
 		}
 
-		if (DOMAIN_TYPE_NAME.equals(variable.getBounds()[0].toString()) && parameterType.isAssignableFrom(entityType)) {
+		Type boundType = variable.getBounds()[0];
+		String referenceName = boundType instanceof TypeVariable ? boundType.toString() : variable.toString();
+
+		if (DOMAIN_TYPE_NAME.equals(referenceName) && parameterType.isAssignableFrom(entityType)) {
 			return true;
 		}
 
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 5cb699372..fb4b43987 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
@@ -120,9 +120,13 @@ public class DefaultRepositoryInformationUnitTests {
 		RepositoryInformation information = new DefaultRepositoryInformation(metadata, CrudRepository.class, null);
 
 		Method saveMethod = BaseRepository.class.getMethod("save", Object.class);
+		Method deleteMethod = BaseRepository.class.getMethod("delete", Object.class);
 
-		assertThat(information.getQueryMethods(), is(Matchers.<Method> iterableWithSize(2)));
-		assertThat(information.getQueryMethods(), not(hasItem(saveMethod)));
+		Iterable<Method> queryMethods = information.getQueryMethods();
+
+		assertThat(queryMethods, not(hasItem(saveMethod)));
+		assertThat(queryMethods, not(hasItem(deleteMethod)));
+		assertThat(queryMethods, is(Matchers.<Method> iterableWithSize(2)));
 	}
 
 	private Method getMethodFrom(Class<?> type, String name) {
@@ -159,11 +163,13 @@ public class DefaultRepositoryInformationUnitTests {
 		}
 	}
 
-	interface BaseRepository<T, ID extends Serializable> extends CrudRepository<T, ID> {
+	interface BaseRepository<S, ID extends Serializable> extends CrudRepository<S, ID> {
 
-		T findBySomething(String something);
+		S findBySomething(String something);
 
-		<K extends T> K save(K entity);
+		<K extends S> K save(K entity);
+
+		void delete(S entity);
 	}
 
 	interface ConcreteRepository extends BaseRepository<User, Integer> {