diff --git a/src/main/java/org/springframework/data/util/ClassTypeInformation.java b/src/main/java/org/springframework/data/util/ClassTypeInformation.java
index ee288dd10..a5b160455 100644
--- a/src/main/java/org/springframework/data/util/ClassTypeInformation.java
+++ b/src/main/java/org/springframework/data/util/ClassTypeInformation.java
@@ -133,7 +133,12 @@ public class ClassTypeInformation<S> extends TypeDiscoverer<S> {
 			map.put(entry.getKey(), entry.getValue());
 
 			if (value instanceof Class) {
-				map.putAll(getTypeVariableMap((Class<?>) value, visited));
+
+				for (Entry<TypeVariable<?>, Type> nestedEntry : getTypeVariableMap((Class<?>) value, visited).entrySet()) {
+					if (!map.containsKey(nestedEntry.getKey())) {
+						map.put(nestedEntry.getKey(), nestedEntry.getValue());
+					}
+				}
 			}
 		}
 
diff --git a/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java b/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java
index 5f9e42b5f..c4a4af0fa 100644
--- a/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java
+++ b/src/test/java/org/springframework/data/util/ClassTypeInformationUnitTests.java
@@ -106,7 +106,7 @@ public class ClassTypeInformationUnitTests {
 
 		property = information.getProperty("rawSet");
 		assertEquals(Set.class, property.getType());
-		assertThat(property.getComponentType().getType(), is(Matchers.<Class<?>> equalTo(Object.class)));
+		assertThat(property.getComponentType().getType(), is(Matchers.<Class<?>>equalTo(Object.class)));
 		assertNull(property.getMapValueType());
 	}
 
@@ -402,6 +402,17 @@ public class ClassTypeInformationUnitTests {
 		assertThat(left.hashCode(), is(right.hashCode()));
 	}
 
+	/**
+	 * @see DATACMNS-896
+	 */
+	@Test
+	public void prefersLocalTypeMappingOverNestedWithSameGenericType() {
+
+		ClassTypeInformation<Concrete> information = ClassTypeInformation.from(Concrete.class);
+
+		assertThat(information.getProperty("field").getType(), is(typeCompatibleWith(Nested.class)));
+	}
+
 	static class StringMapContainer extends MapContainer<String> {
 
 	}
@@ -590,4 +601,14 @@ public class ClassTypeInformationUnitTests {
 		T field;
 		S anotherField;
 	}
+
+	// DATACMNS-896
+
+	static class SomeType<T> {
+		T field;
+	}
+
+	static class Nested extends SomeType<String> {}
+
+	static class Concrete extends SomeType<Nested> {}
 }