diff --git a/test/test_SnipMate.py b/test/test_SnipMate.py
index f8cdbde..c730354 100644
--- a/test/test_SnipMate.py
+++ b/test/test_SnipMate.py
@@ -174,3 +174,18 @@ endsnippet
     keys = 'def' + EX
     wanted = 'ultisnips'
 # End: snipMate support  #}}}
+
+class snipMate_Issue658(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet /*
+\t/*
+\t * ${0}
+\t */
+"""}
+    keys = ESC + ':set fo=r\n' + 'i/*' + EX + '1\n2'
+    wanted = """/*
+ * 1
+ * 2
+ */
+""";
+# End: snipMate support  #}}}