diff --git a/src/testdir/test_utf8.in b/src/testdir/test_utf8.in
new file mode 100644
index 0000000000..713fee2c8f
--- /dev/null
+++ b/src/testdir/test_utf8.in
@@ -0,0 +1,18 @@
+Tests for Unicode manipulations                vim: set ft=vim :
+ 
+STARTTEST
+:so small.vim
+:set encoding=utf-8
+:" Visual block Insert adjusts for multi-byte char
+:new
+:call setline(1, ["aaa", "あああ", "bbb"])
+:exe ":norm! gg0l\<C-V>jjIx\<Esc>"
+:let r = getline(1, '$')
+:
+:bwipeout!
+:$put=r
+:call garbagecollect(1)
+:/^start:/,$wq! test.out
+ENDTEST
+ 
+start:
diff --git a/src/testdir/test_utf8.ok b/src/testdir/test_utf8.ok
new file mode 100644
index 0000000000..c5bed54856
--- /dev/null
+++ b/src/testdir/test_utf8.ok
@@ -0,0 +1,4 @@
+start:
+axaa
+xあああ
+bxbb