diff --git a/src/main/java/org/springframework/data/repository/query/parser/PartTree.java b/src/main/java/org/springframework/data/repository/query/parser/PartTree.java
index b52c66c10..2126a832a 100644
--- a/src/main/java/org/springframework/data/repository/query/parser/PartTree.java
+++ b/src/main/java/org/springframework/data/repository/query/parser/PartTree.java
@@ -34,13 +34,11 @@ import org.springframework.util.StringUtils;
  * each query execution.
  * 
  * @author Oliver Gierke
- * @author Thomas Darimont
  */
 public class PartTree implements Iterable<OrPart> {
 
-	private static final Pattern PREFIX_TEMPLATE = Pattern
-			.compile("^(find|read|get|count)((\\p{Lu}|\\P{M}\\p{M}*+).*?)??By");
-	private static final String KEYWORD_TEMPLATE = "(%s)(?=(\\p{Lu}|\\P{M}\\p{M}*+))";
+	private static final Pattern PREFIX_TEMPLATE = Pattern.compile("^(find|read|get|count)(\\p{Lu}.*?)??By");
+	private static final String KEYWORD_TEMPLATE = "(%s)(?=\\p{Lu})";
 
 	/**
 	 * The subject, for example "findDistinctUserByNameOrderByAge" would have the subject "DistinctUser".
diff --git a/src/test/java/org/springframework/data/repository/query/parser/PartTreeUnitTests.java b/src/test/java/org/springframework/data/repository/query/parser/PartTreeUnitTests.java
index 1ba444d28..5cfc8a5d9 100644
--- a/src/test/java/org/springframework/data/repository/query/parser/PartTreeUnitTests.java
+++ b/src/test/java/org/springframework/data/repository/query/parser/PartTreeUnitTests.java
@@ -40,7 +40,6 @@ import org.springframework.data.repository.query.parser.PartTree.OrPart;
  * 
  * @author Oliver Gierke
  * @author Phillip Webb
- * @author Thomas Darimont
  */
 public class PartTreeUnitTests {
 
@@ -358,17 +357,6 @@ public class PartTreeUnitTests {
 		assertThat(new PartTree("findByCategoryId", Product.class), is(notNullValue()));
 	}
 
-	/**
-	 * @see DATACMNS-363
-	 */
-	@Test
-	public void supportNonLowercaseUnicodeAttributeNamesInQueryMethodNames() throws Exception {
-
-		PartTree tree = new PartTree("findBy생일And이름", DomainObjectWithSpecialChars.class);
-		assertPart(tree, new Part[] { new Part("생일", DomainObjectWithSpecialChars.class),
-				new Part("이름", DomainObjectWithSpecialChars.class) });
-	}
-
 	private static void assertType(Iterable<String> sources, Type type, String property) {
 		assertType(sources, type, property, 1, true);
 	}
@@ -446,9 +434,6 @@ public class PartTreeUnitTests {
 	class DomainObjectWithSpecialChars {
 		String øre;
 		String år;
-
-		String 생일; // Birthday
-		String 이름; // Name
 	}
 
 	interface Product {