diff --git a/core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java b/core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java
index 5584cc54df2..90c6ad3f3b4 100644
--- a/core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java
+++ b/core/src/main/java/org/elasticsearch/index/analysis/CharMatcher.java
@@ -88,6 +88,7 @@ public interface CharMatcher {
                 case Character.CURRENCY_SYMBOL:
                 case Character.MATH_SYMBOL:
                 case Character.OTHER_SYMBOL:
+                case Character.MODIFIER_SYMBOL:
                     return true;
                  default:
                      return false;
diff --git a/core/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java b/core/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java
new file mode 100644
index 00000000000..31f80a66cda
--- /dev/null
+++ b/core/src/test/java/org/elasticsearch/index/analysis/CharMatcherTests.java
@@ -0,0 +1,71 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.elasticsearch.index.analysis;
+
+import org.elasticsearch.test.ESTestCase;
+
+public class CharMatcherTests extends ESTestCase {
+
+    public void testLetter() {
+        assertTrue(CharMatcher.Basic.LETTER.isTokenChar('a')); // category Ll
+        assertTrue(CharMatcher.Basic.LETTER.isTokenChar('é')); // category Ll
+        assertTrue(CharMatcher.Basic.LETTER.isTokenChar('A')); // category Lu
+        assertTrue(CharMatcher.Basic.LETTER.isTokenChar('Å')); // category Lu
+        assertTrue(CharMatcher.Basic.LETTER.isTokenChar('ʰ')); // category Lm
+        assertTrue(CharMatcher.Basic.LETTER.isTokenChar('ª')); // category Lo
+        assertTrue(CharMatcher.Basic.LETTER.isTokenChar('Dž')); // category Lt
+        assertFalse(CharMatcher.Basic.LETTER.isTokenChar(' '));
+        assertFalse(CharMatcher.Basic.LETTER.isTokenChar('0'));
+        assertFalse(CharMatcher.Basic.LETTER.isTokenChar('!'));
+    }
+
+    public void testSpace() {
+        assertTrue(CharMatcher.Basic.WHITESPACE.isTokenChar(' '));
+        assertTrue(CharMatcher.Basic.WHITESPACE.isTokenChar('\t'));
+        assertFalse(CharMatcher.Basic.WHITESPACE.isTokenChar('\u00A0')); // nbsp
+    }
+
+    public void testNumber() {
+        assertTrue(CharMatcher.Basic.DIGIT.isTokenChar('1'));
+        assertTrue(CharMatcher.Basic.DIGIT.isTokenChar('١')); // ARABIC-INDIC DIGIT ONE
+        assertFalse(CharMatcher.Basic.DIGIT.isTokenChar(','));
+        assertFalse(CharMatcher.Basic.DIGIT.isTokenChar('a'));
+    }
+
+    public void testSymbol() {
+        assertTrue(CharMatcher.Basic.SYMBOL.isTokenChar('$')); // category Sc
+        assertTrue(CharMatcher.Basic.SYMBOL.isTokenChar('+')); // category Sm
+        assertTrue(CharMatcher.Basic.SYMBOL.isTokenChar('`')); // category Sm
+        assertTrue(CharMatcher.Basic.SYMBOL.isTokenChar('^')); // category Sk
+        assertTrue(CharMatcher.Basic.SYMBOL.isTokenChar('¦')); // category Sc
+        assertFalse(CharMatcher.Basic.SYMBOL.isTokenChar(' '));
+    }
+
+    public void testPunctuation() {
+        assertTrue(CharMatcher.Basic.PUNCTUATION.isTokenChar('(')); // category Ps
+        assertTrue(CharMatcher.Basic.PUNCTUATION.isTokenChar(')')); // category Pe
+        assertTrue(CharMatcher.Basic.PUNCTUATION.isTokenChar('_')); // category Pc
+        assertTrue(CharMatcher.Basic.PUNCTUATION.isTokenChar('!')); // category Po
+        assertTrue(CharMatcher.Basic.PUNCTUATION.isTokenChar('-')); // category Pd
+        assertTrue(CharMatcher.Basic.PUNCTUATION.isTokenChar('«')); // category Pi
+        assertTrue(CharMatcher.Basic.PUNCTUATION.isTokenChar('»')); // category Pf
+        assertFalse(CharMatcher.Basic.PUNCTUATION.isTokenChar(' '));
+    }
+}