diff --git a/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java b/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java
index ca570c0bb..152928777 100644
--- a/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java
+++ b/src/main/java/org/springframework/data/mapping/model/SimpleTypeHolder.java
@@ -123,6 +123,10 @@ public class SimpleTypeHolder {
 			return true;
 		}
 
+		if (type.getName().startsWith("java.lang")) {
+			return true;
+		}
+
 		for (Class<?> clazz : simpleTypes) {
 			if (clazz.isAssignableFrom(type)) {
 				simpleTypes.add(type);
diff --git a/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java b/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java
index 7636f1a38..76abc21a4 100644
--- a/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java
+++ b/src/test/java/org/springframework/data/mapping/SimpleTypeHolderUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 by the original author(s).
+ * Copyright 2011-2017 by the original author(s).
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,10 @@ package org.springframework.data.mapping;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.*;
 
+import java.lang.reflect.Type;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.UUID;
 
 import org.junit.Test;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
@@ -60,7 +62,7 @@ public class SimpleTypeHolderUnitTests {
 
 		SimpleTypeHolder holder = new SimpleTypeHolder(new HashSet<Class<?>>(), false);
 
-		assertThat(holder.isSimpleType(String.class), is(false));
+		assertThat(holder.isSimpleType(UUID.class), is(false));
 	}
 
 	@Test
@@ -104,6 +106,14 @@ public class SimpleTypeHolderUnitTests {
 		assertThat(holder.isSimpleType(ComplexEnum.FOO.getClass()), is(true));
 	}
 
+	@Test // DATACMNS-1006
+	public void considersJavaLangTypesSimple() {
+
+		SimpleTypeHolder holder = new SimpleTypeHolder();
+
+		assertThat(holder.isSimpleType(Type.class), is(true));
+	}
+
 	enum SimpleEnum {
 
 		FOO;