diff --git a/tests/HashTagDetectionTests.php b/tests/HashTagDetectionTests.php
index 483d7135e1..47031d5bc4 100644
--- a/tests/HashTagDetectionTests.php
+++ b/tests/HashTagDetectionTests.php
@@ -42,6 +42,21 @@ class HashTagDetectionTests extends PHPUnit_Framework_TestCase
'say {#hello} people'),
array('say \'#hello\' people',
'say \'#hello\' people'),
+
+ // Unicode legit letters
+ array('#éclair yummy',
+ '#éclair yummy'),
+ array('#维基百科 zh.wikipedia!',
+ '#维基百科 zh.wikipedia!'),
+ array('#Россия russia',
+ '#Россия russia'),
+
+ // Unicode punctuators -- the ideographic "," separates the tag, just as "," does
+ array('#维基百科,zh.wikipedia!',
+ '#维基百科,zh.wikipedia!'),
+ array('#维基百科,zh.wikipedia!',
+ '#维基百科,zh.wikipedia!'),
+
);
}
}