diff --git a/tests/test_shape.py b/tests/test_shape.py
new file mode 100644
index 000000000..8231b2c94
--- /dev/null
+++ b/tests/test_shape.py
@@ -0,0 +1,27 @@
+from __future__ import unicode_literals
+
+import pytest
+
+from spacy.orth import word_shape as ws
+
+
+def test_capitalized():
+    assert ws('Nasa') == 'Xxxx'
+
+def test_truncate():
+    assert ws('capitalized') == 'xxx'
+
+def test_digits():
+    assert ws('999999999') == 'ddd'
+
+def test_mix():
+    assert ws('C3P0') == 'XdXd'
+
+def test_punct():
+    assert ws(',') == ','
+
+def test_space():
+    assert ws('\n') == '\n'
+
+def test_punct_seq():
+    assert ws('``,-') == '``,-'