7 files changed, 9 insertions, 12 deletions

diff --git a/src/nvim/testdir/test10.in b/src/nvim/testdir/test10.in
index 2d0d546606..769d690acb 100644
--- a/src/nvim/testdir/test10.in
+++ b/src/nvim/testdir/test10.in
@@ -4,7 +4,6 @@ STARTTEST
 :so small.vim
 :" Also test a BOM is ignored.
 :so mbyte.vim
-:set encoding=utf-8
 :7/start of errorfile/,/end of errorfile/w! Xerrorfile1
 :7/start of errorfile/,/end of errorfile/-1w! Xerrorfile2
 :/start of testfile/,/end of testfile/w! Xtestfile
diff --git a/src/nvim/testdir/test39.in b/src/nvim/testdir/test39.in
index c4e46fff26..ebbcbd6d0d 100644
--- a/src/nvim/testdir/test39.in
+++ b/src/nvim/testdir/test39.in
@@ -5,8 +5,6 @@ And test "U" in Visual mode, also on German sharp S.
 STARTTEST
 :so small.vim
 :so mbyte.vim
-:" This only works when 'encoding' is "latin1", don't depend on the environment
-:set enc=latin1
 /^abcde
 :" Test shift-right of a block
 jlllljj>wlljlll>
@@ -39,18 +37,18 @@ G$khhhhhkkcmno
 :exe ":norm! l\<C-V>j$hhAab\<Esc>"
 :.,/^$/w >> test.out
 :" Test for Visual block insert when virtualedit=all and utf-8 encoding
-:set ve=all enc=utf-8
+:set ve=all
 :/\t\tline
 :exe ":norm! 07l\<C-V>jjIx\<Esc>"
 :.,/^$/w >> test.out
 :" Test for Visual block append when virtualedit=all
 :exe ":norm! 012l\<C-v>jjAx\<Esc>"
-:set ve= enc=latin1
+:set ve=
 :.,/^$/w >> test.out
-:" gUe must uppercase a whole word, also when ß changes to SS
-Gothe youtußeuu endYpk0wgUe
+:" gUe must uppercase a whole word, also when ß changes to SS
+Gothe youtußeuu endYpk0wgUe
 :" gUfx must uppercase until x, inclusive.
-O- youßtußexu -0fogUfx
+O- youßtußexu -0fogUfx
 :" VU must uppercase a whole line
 YpkVU
 :" same, when it's the last line in the buffer
@@ -89,7 +87,7 @@ cccc
 dddd
 
 yaaa
-¿¿¿
+¿¿¿
 bbb
 
 A23
diff --git a/src/nvim/testdir/test39.ok b/src/nvim/testdir/test39.ok
index 5c517e2223..198e5b14dc 100644
--- a/src/nvim/testdir/test39.ok
+++ b/src/nvim/testdir/test39.ok
diff --git a/src/nvim/testdir/test69.in b/src/nvim/testdir/test69.in
index 26f41e8a29..f583947dfb 100644
--- a/src/nvim/testdir/test69.in
+++ b/src/nvim/testdir/test69.in
@@ -5,7 +5,6 @@ Also test byteidx() and byteidxcomp()
 
 STARTTEST
 :so mbyte.vim
-:set encoding=utf-8
 ENDTEST
 
 Results of test69:
diff --git a/src/nvim/testdir/test83.in b/src/nvim/testdir/test83.in
index 297d560d2f..d54b1bcddd 100644
--- a/src/nvim/testdir/test83.in
+++ b/src/nvim/testdir/test83.in
@@ -2,7 +2,6 @@ Tests for tag search with !_TAG_FILE_ENCODING.
 
 STARTTEST
 :so mbyte.vim
-:set enc=utf8
 :if !has('iconv') || iconv("\x82\x60", "cp932", "utf-8") != "\uff21"
 : e! test.ok
 : w! test.out
diff --git a/src/nvim/testdir/test_eval.in b/src/nvim/testdir/test_eval.in
index 328ee2e127..b2b982a434 100644
--- a/src/nvim/testdir/test_eval.in
+++ b/src/nvim/testdir/test_eval.in
@@ -4,7 +4,6 @@ Note: system clipboard is saved, changed and restored.
 
 STARTTEST
 :so small.vim
-:set encoding=latin1
 :set noswapfile
 :lang C
 :fun AppendRegContents(reg)
diff --git a/src/nvim/testdir/unix.vim b/src/nvim/testdir/unix.vim
index f766e74c30..aa1f6a92bc 100644
--- a/src/nvim/testdir/unix.vim
+++ b/src/nvim/testdir/unix.vim
@@ -1,3 +1,6 @@
 " Settings for test script execution
 " Always use "sh", don't use the value of "$SHELL".
 set shell=sh
+
+" Don't depend on system locale, always use utf-8
+set encoding=utf-8