diff --git a/.gitattributes b/.gitattributes
index a1aa7e155f..1128560dc2 100755
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,6 +8,4 @@ src/xdiff/**    linguist-vendored
 src/cjson/**    linguist-vendored
 src/unicode/**  linguist-vendored
 
-src/nvim/testdir/test42.in diff
-
 .github/    export-ignore
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 16bbca7050..e6c134b583 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -366,5 +366,5 @@ jobs:
           # But would break functionaltest, where its `more` would be used then.
           $OldPath = $env:PATH
           $env:PATH = "C:\msys64\usr\bin;$env:PATH"
-          & "C:\msys64\mingw64\bin\mingw32-make.exe" -C $(Convert-Path src\nvim\testdir) VERBOSE=1
+          & "C:\msys64\mingw64\bin\mingw32-make.exe" -C $(Convert-Path test\old\testdir) VERBOSE=1
           $env:PATH = $OldPath
diff --git a/.gitignore b/.gitignore
index 57acde8722..b20d9ef19b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,21 +36,21 @@ compile_commands.json
 *.rej
 
 # Generated by old (Vim) tests.
-/src/nvim/testdir/del
-/src/nvim/testdir/test*.out
-/src/nvim/testdir/test*.res
-/src/nvim/testdir/test*.log
-/src/nvim/testdir/messages
-/src/nvim/testdir/viminfo
-/src/nvim/testdir/test.ok
-/src/nvim/testdir/*.failed
-/src/nvim/testdir/X*
-/src/nvim/testdir/valgrind.*
-/src/nvim/testdir/.gdbinit
+/test/old/testdir/testdir/del
+/test/old/testdir/testdir/test*.out
+/test/old/testdir/testdir/test*.res
+/test/old/testdir/testdir/test*.log
+/test/old/testdir/testdir/messages
+/test/old/testdir/testdir/viminfo
+/test/old/testdir/testdir/test.ok
+/test/old/testdir/testdir/*.failed
+/test/old/testdir/testdir/X*
+/test/old/testdir/testdir/valgrind.*
+/test/old/testdir/testdir/.gdbinit
 /runtime/indent/testdir/*.out
 +runtime/indent/testdir/*.fail
-# Generated by src/nvim/testdir/runnvim.sh.
-/src/nvim/testdir/*.tlog
+# Generated by test/old/testdir/testdir/runnvim.sh.
+/test/old/testdir/testdir/*.tlog
 
 # Generated by unit tests.
 /test/includes/post/
diff --git a/Makefile b/Makefile
index dc5833d0bf..20435d615e 100644
--- a/Makefile
+++ b/Makefile
@@ -113,17 +113,17 @@ build/.ran-deps-cmake::
 
 # TODO: cmake 3.2+ add_custom_target() has a USES_TERMINAL flag.
 oldtest: | nvim build/runtime/doc/tags
-	+$(SINGLE_MAKE) -C src/nvim/testdir clean
+	+$(SINGLE_MAKE) -C test/old/testdir clean
 ifeq ($(strip $(TEST_FILE)),)
-	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG=$(NVIM_PRG) $(MAKEOVERRIDES)
+	+$(SINGLE_MAKE) -C test/old/testdir NVIM_PRG=$(NVIM_PRG) $(MAKEOVERRIDES)
 else
 	@# Handle TEST_FILE=test_foo{,.res,.vim}.
-	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG=$(NVIM_PRG) SCRIPTS= $(MAKEOVERRIDES) $(patsubst %.vim,%,$(patsubst %.res,%,$(TEST_FILE)))
+	+$(SINGLE_MAKE) -C test/old/testdir NVIM_PRG=$(NVIM_PRG) SCRIPTS= $(MAKEOVERRIDES) $(patsubst %.vim,%,$(patsubst %.res,%,$(TEST_FILE)))
 endif
 # Build oldtest by specifying the relative .vim filename.
 .PHONY: phony_force
-src/nvim/testdir/%.vim: phony_force
-	+$(SINGLE_MAKE) -C src/nvim/testdir NVIM_PRG=$(NVIM_PRG) SCRIPTS= $(MAKEOVERRIDES) $(patsubst src/nvim/testdir/%.vim,%,$@)
+test/old/testdir/%.vim: phony_force
+	+$(SINGLE_MAKE) -C test/old/testdir NVIM_PRG=$(NVIM_PRG) SCRIPTS= $(MAKEOVERRIDES) $(patsubst test/old/testdir/%.vim,%,$@)
 
 functionaltest-lua: | nvim
 	$(BUILD_TOOL) -C build $@
@@ -143,7 +143,7 @@ iwyu: build/.ran-cmake
 
 clean:
 	+test -d build && $(BUILD_TOOL) -C build clean || true
-	$(MAKE) -C src/nvim/testdir clean
+	$(MAKE) -C test/old/testdir clean
 	$(MAKE) -C runtime/indent clean
 
 distclean:
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index f9f7330097..06ddf0f3b8 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -226,6 +226,10 @@ preprocess_patch() {
   local na_vimrcexample='vimrc_example\.vim'
   2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/runtime/\<\%('${na_vimrcexample}'\)\>@norm! d/\v(^diff)|%$
' +w +q "$file"
 
+  # Rename src/testdir/ paths to test/old/testdir/
+  LC_ALL=C sed -e 's/\( [ab]\)\/src\/testdir/\1\/test\/old\/testdir/g' \
+    "$file" > "$file".tmp && mv "$file".tmp "$file"
+
   # Rename src/ paths to src/nvim/
   LC_ALL=C sed -e 's/\( [ab]\/src\)/\1\/nvim/g' \
     "$file" > "$file".tmp && mv "$file".tmp "$file"
diff --git a/test/README.md b/test/README.md
index a67040e68c..d8d918eb61 100644
--- a/test/README.md
+++ b/test/README.md
@@ -3,7 +3,7 @@ Tests
 
 Tests are broadly divided into *unit tests* ([test/unit](https://github.com/neovim/neovim/tree/master/test/unit/)),
 *functional tests* ([test/functional](https://github.com/neovim/neovim/tree/master/test/functional/)),
-and *old tests* ([src/nvim/testdir/](https://github.com/neovim/neovim/tree/master/src/nvim/testdir/)).
+and *old tests* ([test/old/testdir/](https://github.com/neovim/neovim/tree/master/test/old/testdir/)).
 
 - _Unit_ testing is achieved by compiling the tests as a shared library which is
   loaded and called by [LuaJit FFI](http://luajit.org/ext_ffi.html).
@@ -48,7 +48,7 @@ Layout
 - `/test/*/**/*_spec.lua` : actual tests. Files that do not end with
   `_spec.lua` are libraries like `/test/**/helpers.lua`, except that they have
   some common topic.
-- `/src/nvim/testdir` : old tests (from Vim)
+- `/test/old/testdir` : old tests (from Vim)
 
 
 Running tests
@@ -83,7 +83,7 @@ To run a *single* legacy test file you can use either:
 
 or:
 
-    make src/nvim/testdir/test_syntax.vim
+    make test/old/testdir/test_syntax.vim
 
 - Specify only the test file name, not the full path.
 
diff --git a/test/benchmark/bench_regexp_spec.lua b/test/benchmark/bench_regexp_spec.lua
index 903af5f574..6128549f0f 100644
--- a/test/benchmark/bench_regexp_spec.lua
+++ b/test/benchmark/bench_regexp_spec.lua
@@ -7,7 +7,7 @@ local clear, command = helpers.clear, helpers.command
 -- Temporary file for gathering benchmarking results for each regexp engine.
 local result_file = 'benchmark.out'
 -- Fixture containing an HTML fragment that can make a search appear to freeze.
-local sample_file = 'src/nvim/testdir/samples/re.freeze.txt'
+local sample_file = 'test/old/testdir/samples/re.freeze.txt'
 
 -- Vim script code that does both the work and the benchmarking of that work.
 local measure_cmd =
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index cd6b535477..43e5b73608 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -898,7 +898,7 @@ local load_factor = 1
 if global_helpers.is_ci() then
   -- Compute load factor only once (but outside of any tests).
   module.clear()
-  module.request('nvim_command', 'source src/nvim/testdir/load.vim')
+  module.request('nvim_command', 'source test/old/testdir/load.vim')
   load_factor = module.request('nvim_eval', 'g:test_load_factor')
 end
 function module.load_adjust(num)
diff --git a/test/functional/legacy/options_spec.lua b/test/functional/legacy/options_spec.lua
index bd14f3bc53..ce46ea013d 100644
--- a/test/functional/legacy/options_spec.lua
+++ b/test/functional/legacy/options_spec.lua
@@ -1,4 +1,4 @@
--- See also: src/nvim/testdir/test_options.vim
+-- See also: test/old/testdir/test_options.vim
 local helpers = require('test.functional.helpers')(after_each)
 local command, clear = helpers.command, helpers.clear
 local source, expect = helpers.source, helpers.expect
diff --git a/src/nvim/testdir/Make_all.mak b/test/old/testdir/Make_all.mak
similarity index 100%
rename from src/nvim/testdir/Make_all.mak
rename to test/old/testdir/Make_all.mak
diff --git a/src/nvim/testdir/Makefile b/test/old/testdir/Makefile
similarity index 100%
rename from src/nvim/testdir/Makefile
rename to test/old/testdir/Makefile
diff --git a/src/nvim/testdir/README.txt b/test/old/testdir/README.txt
similarity index 100%
rename from src/nvim/testdir/README.txt
rename to test/old/testdir/README.txt
diff --git a/src/nvim/testdir/check.vim b/test/old/testdir/check.vim
similarity index 100%
rename from src/nvim/testdir/check.vim
rename to test/old/testdir/check.vim
diff --git a/src/nvim/testdir/dotest.in b/test/old/testdir/dotest.in
similarity index 100%
rename from src/nvim/testdir/dotest.in
rename to test/old/testdir/dotest.in
diff --git a/src/nvim/testdir/load.vim b/test/old/testdir/load.vim
similarity index 100%
rename from src/nvim/testdir/load.vim
rename to test/old/testdir/load.vim
diff --git a/src/nvim/testdir/pyxfile/py2_magic.py b/test/old/testdir/pyxfile/py2_magic.py
similarity index 100%
rename from src/nvim/testdir/pyxfile/py2_magic.py
rename to test/old/testdir/pyxfile/py2_magic.py
diff --git a/src/nvim/testdir/pyxfile/py2_shebang.py b/test/old/testdir/pyxfile/py2_shebang.py
similarity index 100%
rename from src/nvim/testdir/pyxfile/py2_shebang.py
rename to test/old/testdir/pyxfile/py2_shebang.py
diff --git a/src/nvim/testdir/pyxfile/py3_magic.py b/test/old/testdir/pyxfile/py3_magic.py
similarity index 100%
rename from src/nvim/testdir/pyxfile/py3_magic.py
rename to test/old/testdir/pyxfile/py3_magic.py
diff --git a/src/nvim/testdir/pyxfile/py3_shebang.py b/test/old/testdir/pyxfile/py3_shebang.py
similarity index 100%
rename from src/nvim/testdir/pyxfile/py3_shebang.py
rename to test/old/testdir/pyxfile/py3_shebang.py
diff --git a/src/nvim/testdir/pyxfile/pyx.py b/test/old/testdir/pyxfile/pyx.py
similarity index 100%
rename from src/nvim/testdir/pyxfile/pyx.py
rename to test/old/testdir/pyxfile/pyx.py
diff --git a/src/nvim/testdir/runnvim.sh b/test/old/testdir/runnvim.sh
similarity index 100%
rename from src/nvim/testdir/runnvim.sh
rename to test/old/testdir/runnvim.sh
diff --git a/src/nvim/testdir/runnvim.vim b/test/old/testdir/runnvim.vim
similarity index 100%
rename from src/nvim/testdir/runnvim.vim
rename to test/old/testdir/runnvim.vim
diff --git a/src/nvim/testdir/runtest.vim b/test/old/testdir/runtest.vim
similarity index 100%
rename from src/nvim/testdir/runtest.vim
rename to test/old/testdir/runtest.vim
diff --git a/src/nvim/testdir/samples/memfile_test.c b/test/old/testdir/samples/memfile_test.c
similarity index 100%
rename from src/nvim/testdir/samples/memfile_test.c
rename to test/old/testdir/samples/memfile_test.c
diff --git a/src/nvim/testdir/samples/quickfix.txt b/test/old/testdir/samples/quickfix.txt
similarity index 100%
rename from src/nvim/testdir/samples/quickfix.txt
rename to test/old/testdir/samples/quickfix.txt
diff --git a/src/nvim/testdir/samples/re.freeze.txt b/test/old/testdir/samples/re.freeze.txt
similarity index 100%
rename from src/nvim/testdir/samples/re.freeze.txt
rename to test/old/testdir/samples/re.freeze.txt
diff --git a/src/nvim/testdir/sautest/autoload/foo.vim b/test/old/testdir/sautest/autoload/foo.vim
similarity index 100%
rename from src/nvim/testdir/sautest/autoload/foo.vim
rename to test/old/testdir/sautest/autoload/foo.vim
diff --git a/src/nvim/testdir/sautest/autoload/footest.vim b/test/old/testdir/sautest/autoload/footest.vim
similarity index 100%
rename from src/nvim/testdir/sautest/autoload/footest.vim
rename to test/old/testdir/sautest/autoload/footest.vim
diff --git a/src/nvim/testdir/sautest/autoload/globone.vim b/test/old/testdir/sautest/autoload/globone.vim
similarity index 100%
rename from src/nvim/testdir/sautest/autoload/globone.vim
rename to test/old/testdir/sautest/autoload/globone.vim
diff --git a/src/nvim/testdir/sautest/autoload/globtwo.vim b/test/old/testdir/sautest/autoload/globtwo.vim
similarity index 100%
rename from src/nvim/testdir/sautest/autoload/globtwo.vim
rename to test/old/testdir/sautest/autoload/globtwo.vim
diff --git a/src/nvim/testdir/sautest/autoload/sourced.vim b/test/old/testdir/sautest/autoload/sourced.vim
similarity index 100%
rename from src/nvim/testdir/sautest/autoload/sourced.vim
rename to test/old/testdir/sautest/autoload/sourced.vim
diff --git a/src/nvim/testdir/screendump.vim b/test/old/testdir/screendump.vim
similarity index 100%
rename from src/nvim/testdir/screendump.vim
rename to test/old/testdir/screendump.vim
diff --git a/src/nvim/testdir/script_util.vim b/test/old/testdir/script_util.vim
similarity index 100%
rename from src/nvim/testdir/script_util.vim
rename to test/old/testdir/script_util.vim
diff --git a/src/nvim/testdir/setup.vim b/test/old/testdir/setup.vim
similarity index 100%
rename from src/nvim/testdir/setup.vim
rename to test/old/testdir/setup.vim
diff --git a/src/nvim/testdir/shared.vim b/test/old/testdir/shared.vim
similarity index 100%
rename from src/nvim/testdir/shared.vim
rename to test/old/testdir/shared.vim
diff --git a/src/nvim/testdir/suite.sh b/test/old/testdir/suite.sh
similarity index 100%
rename from src/nvim/testdir/suite.sh
rename to test/old/testdir/suite.sh
diff --git a/src/nvim/testdir/summarize.vim b/test/old/testdir/summarize.vim
similarity index 100%
rename from src/nvim/testdir/summarize.vim
rename to test/old/testdir/summarize.vim
diff --git a/src/nvim/testdir/term_util.vim b/test/old/testdir/term_util.vim
similarity index 100%
rename from src/nvim/testdir/term_util.vim
rename to test/old/testdir/term_util.vim
diff --git a/src/nvim/testdir/test.sh b/test/old/testdir/test.sh
similarity index 100%
rename from src/nvim/testdir/test.sh
rename to test/old/testdir/test.sh
diff --git a/src/nvim/testdir/test1.in b/test/old/testdir/test1.in
similarity index 100%
rename from src/nvim/testdir/test1.in
rename to test/old/testdir/test1.in
diff --git a/src/nvim/testdir/test1.ok b/test/old/testdir/test1.ok
similarity index 100%
rename from src/nvim/testdir/test1.ok
rename to test/old/testdir/test1.ok
diff --git a/src/nvim/testdir/test_alot.vim b/test/old/testdir/test_alot.vim
similarity index 100%
rename from src/nvim/testdir/test_alot.vim
rename to test/old/testdir/test_alot.vim
diff --git a/src/nvim/testdir/test_alot_latin.vim b/test/old/testdir/test_alot_latin.vim
similarity index 100%
rename from src/nvim/testdir/test_alot_latin.vim
rename to test/old/testdir/test_alot_latin.vim
diff --git a/src/nvim/testdir/test_alot_utf8.vim b/test/old/testdir/test_alot_utf8.vim
similarity index 100%
rename from src/nvim/testdir/test_alot_utf8.vim
rename to test/old/testdir/test_alot_utf8.vim
diff --git a/src/nvim/testdir/test_arabic.vim b/test/old/testdir/test_arabic.vim
similarity index 100%
rename from src/nvim/testdir/test_arabic.vim
rename to test/old/testdir/test_arabic.vim
diff --git a/src/nvim/testdir/test_arglist.vim b/test/old/testdir/test_arglist.vim
similarity index 100%
rename from src/nvim/testdir/test_arglist.vim
rename to test/old/testdir/test_arglist.vim
diff --git a/src/nvim/testdir/test_assert.vim b/test/old/testdir/test_assert.vim
similarity index 100%
rename from src/nvim/testdir/test_assert.vim
rename to test/old/testdir/test_assert.vim
diff --git a/src/nvim/testdir/test_autochdir.vim b/test/old/testdir/test_autochdir.vim
similarity index 100%
rename from src/nvim/testdir/test_autochdir.vim
rename to test/old/testdir/test_autochdir.vim
diff --git a/src/nvim/testdir/test_autocmd.vim b/test/old/testdir/test_autocmd.vim
similarity index 100%
rename from src/nvim/testdir/test_autocmd.vim
rename to test/old/testdir/test_autocmd.vim
diff --git a/src/nvim/testdir/test_autoload.vim b/test/old/testdir/test_autoload.vim
similarity index 100%
rename from src/nvim/testdir/test_autoload.vim
rename to test/old/testdir/test_autoload.vim
diff --git a/src/nvim/testdir/test_backspace_opt.vim b/test/old/testdir/test_backspace_opt.vim
similarity index 100%
rename from src/nvim/testdir/test_backspace_opt.vim
rename to test/old/testdir/test_backspace_opt.vim
diff --git a/src/nvim/testdir/test_backup.vim b/test/old/testdir/test_backup.vim
similarity index 100%
rename from src/nvim/testdir/test_backup.vim
rename to test/old/testdir/test_backup.vim
diff --git a/src/nvim/testdir/test_behave.vim b/test/old/testdir/test_behave.vim
similarity index 100%
rename from src/nvim/testdir/test_behave.vim
rename to test/old/testdir/test_behave.vim
diff --git a/src/nvim/testdir/test_blob.vim b/test/old/testdir/test_blob.vim
similarity index 100%
rename from src/nvim/testdir/test_blob.vim
rename to test/old/testdir/test_blob.vim
diff --git a/src/nvim/testdir/test_blockedit.vim b/test/old/testdir/test_blockedit.vim
similarity index 100%
rename from src/nvim/testdir/test_blockedit.vim
rename to test/old/testdir/test_blockedit.vim
diff --git a/src/nvim/testdir/test_breakindent.vim b/test/old/testdir/test_breakindent.vim
similarity index 100%
rename from src/nvim/testdir/test_breakindent.vim
rename to test/old/testdir/test_breakindent.vim
diff --git a/src/nvim/testdir/test_buffer.vim b/test/old/testdir/test_buffer.vim
similarity index 100%
rename from src/nvim/testdir/test_buffer.vim
rename to test/old/testdir/test_buffer.vim
diff --git a/src/nvim/testdir/test_bufline.vim b/test/old/testdir/test_bufline.vim
similarity index 100%
rename from src/nvim/testdir/test_bufline.vim
rename to test/old/testdir/test_bufline.vim
diff --git a/src/nvim/testdir/test_bufwintabinfo.vim b/test/old/testdir/test_bufwintabinfo.vim
similarity index 100%
rename from src/nvim/testdir/test_bufwintabinfo.vim
rename to test/old/testdir/test_bufwintabinfo.vim
diff --git a/src/nvim/testdir/test_cd.vim b/test/old/testdir/test_cd.vim
similarity index 100%
rename from src/nvim/testdir/test_cd.vim
rename to test/old/testdir/test_cd.vim
diff --git a/src/nvim/testdir/test_cdo.vim b/test/old/testdir/test_cdo.vim
similarity index 100%
rename from src/nvim/testdir/test_cdo.vim
rename to test/old/testdir/test_cdo.vim
diff --git a/src/nvim/testdir/test_changedtick.vim b/test/old/testdir/test_changedtick.vim
similarity index 100%
rename from src/nvim/testdir/test_changedtick.vim
rename to test/old/testdir/test_changedtick.vim
diff --git a/src/nvim/testdir/test_changelist.vim b/test/old/testdir/test_changelist.vim
similarity index 100%
rename from src/nvim/testdir/test_changelist.vim
rename to test/old/testdir/test_changelist.vim
diff --git a/src/nvim/testdir/test_charsearch.vim b/test/old/testdir/test_charsearch.vim
similarity index 100%
rename from src/nvim/testdir/test_charsearch.vim
rename to test/old/testdir/test_charsearch.vim
diff --git a/src/nvim/testdir/test_charsearch_utf8.vim b/test/old/testdir/test_charsearch_utf8.vim
similarity index 100%
rename from src/nvim/testdir/test_charsearch_utf8.vim
rename to test/old/testdir/test_charsearch_utf8.vim
diff --git a/src/nvim/testdir/test_checkpath.vim b/test/old/testdir/test_checkpath.vim
similarity index 100%
rename from src/nvim/testdir/test_checkpath.vim
rename to test/old/testdir/test_checkpath.vim
diff --git a/src/nvim/testdir/test_cindent.vim b/test/old/testdir/test_cindent.vim
similarity index 100%
rename from src/nvim/testdir/test_cindent.vim
rename to test/old/testdir/test_cindent.vim
diff --git a/src/nvim/testdir/test_cjk_linebreak.vim b/test/old/testdir/test_cjk_linebreak.vim
similarity index 100%
rename from src/nvim/testdir/test_cjk_linebreak.vim
rename to test/old/testdir/test_cjk_linebreak.vim
diff --git a/src/nvim/testdir/test_clientserver.vim b/test/old/testdir/test_clientserver.vim
similarity index 100%
rename from src/nvim/testdir/test_clientserver.vim
rename to test/old/testdir/test_clientserver.vim
diff --git a/src/nvim/testdir/test_close_count.vim b/test/old/testdir/test_close_count.vim
similarity index 100%
rename from src/nvim/testdir/test_close_count.vim
rename to test/old/testdir/test_close_count.vim
diff --git a/src/nvim/testdir/test_cmdline.vim b/test/old/testdir/test_cmdline.vim
similarity index 100%
rename from src/nvim/testdir/test_cmdline.vim
rename to test/old/testdir/test_cmdline.vim
diff --git a/src/nvim/testdir/test_command_count.vim b/test/old/testdir/test_command_count.vim
similarity index 100%
rename from src/nvim/testdir/test_command_count.vim
rename to test/old/testdir/test_command_count.vim
diff --git a/src/nvim/testdir/test_comments.vim b/test/old/testdir/test_comments.vim
similarity index 100%
rename from src/nvim/testdir/test_comments.vim
rename to test/old/testdir/test_comments.vim
diff --git a/src/nvim/testdir/test_comparators.vim b/test/old/testdir/test_comparators.vim
similarity index 100%
rename from src/nvim/testdir/test_comparators.vim
rename to test/old/testdir/test_comparators.vim
diff --git a/src/nvim/testdir/test_compiler.vim b/test/old/testdir/test_compiler.vim
similarity index 100%
rename from src/nvim/testdir/test_compiler.vim
rename to test/old/testdir/test_compiler.vim
diff --git a/src/nvim/testdir/test_conceal.vim b/test/old/testdir/test_conceal.vim
similarity index 100%
rename from src/nvim/testdir/test_conceal.vim
rename to test/old/testdir/test_conceal.vim
diff --git a/src/nvim/testdir/test_const.vim b/test/old/testdir/test_const.vim
similarity index 100%
rename from src/nvim/testdir/test_const.vim
rename to test/old/testdir/test_const.vim
diff --git a/src/nvim/testdir/test_cpoptions.vim b/test/old/testdir/test_cpoptions.vim
similarity index 100%
rename from src/nvim/testdir/test_cpoptions.vim
rename to test/old/testdir/test_cpoptions.vim
diff --git a/src/nvim/testdir/test_cursor_func.vim b/test/old/testdir/test_cursor_func.vim
similarity index 100%
rename from src/nvim/testdir/test_cursor_func.vim
rename to test/old/testdir/test_cursor_func.vim
diff --git a/src/nvim/testdir/test_cursorline.vim b/test/old/testdir/test_cursorline.vim
similarity index 100%
rename from src/nvim/testdir/test_cursorline.vim
rename to test/old/testdir/test_cursorline.vim
diff --git a/src/nvim/testdir/test_curswant.vim b/test/old/testdir/test_curswant.vim
similarity index 100%
rename from src/nvim/testdir/test_curswant.vim
rename to test/old/testdir/test_curswant.vim
diff --git a/src/nvim/testdir/test_debugger.vim b/test/old/testdir/test_debugger.vim
similarity index 100%
rename from src/nvim/testdir/test_debugger.vim
rename to test/old/testdir/test_debugger.vim
diff --git a/src/nvim/testdir/test_delete.vim b/test/old/testdir/test_delete.vim
similarity index 100%
rename from src/nvim/testdir/test_delete.vim
rename to test/old/testdir/test_delete.vim
diff --git a/src/nvim/testdir/test_diffmode.vim b/test/old/testdir/test_diffmode.vim
similarity index 100%
rename from src/nvim/testdir/test_diffmode.vim
rename to test/old/testdir/test_diffmode.vim
diff --git a/src/nvim/testdir/test_digraph.vim b/test/old/testdir/test_digraph.vim
similarity index 100%
rename from src/nvim/testdir/test_digraph.vim
rename to test/old/testdir/test_digraph.vim
diff --git a/src/nvim/testdir/test_display.vim b/test/old/testdir/test_display.vim
similarity index 100%
rename from src/nvim/testdir/test_display.vim
rename to test/old/testdir/test_display.vim
diff --git a/src/nvim/testdir/test_edit.vim b/test/old/testdir/test_edit.vim
similarity index 100%
rename from src/nvim/testdir/test_edit.vim
rename to test/old/testdir/test_edit.vim
diff --git a/src/nvim/testdir/test_environ.vim b/test/old/testdir/test_environ.vim
similarity index 100%
rename from src/nvim/testdir/test_environ.vim
rename to test/old/testdir/test_environ.vim
diff --git a/src/nvim/testdir/test_erasebackword.vim b/test/old/testdir/test_erasebackword.vim
similarity index 100%
rename from src/nvim/testdir/test_erasebackword.vim
rename to test/old/testdir/test_erasebackword.vim
diff --git a/src/nvim/testdir/test_escaped_glob.vim b/test/old/testdir/test_escaped_glob.vim
similarity index 100%
rename from src/nvim/testdir/test_escaped_glob.vim
rename to test/old/testdir/test_escaped_glob.vim
diff --git a/src/nvim/testdir/test_eval_stuff.vim b/test/old/testdir/test_eval_stuff.vim
similarity index 100%
rename from src/nvim/testdir/test_eval_stuff.vim
rename to test/old/testdir/test_eval_stuff.vim
diff --git a/src/nvim/testdir/test_ex_equal.vim b/test/old/testdir/test_ex_equal.vim
similarity index 100%
rename from src/nvim/testdir/test_ex_equal.vim
rename to test/old/testdir/test_ex_equal.vim
diff --git a/src/nvim/testdir/test_ex_mode.vim b/test/old/testdir/test_ex_mode.vim
similarity index 100%
rename from src/nvim/testdir/test_ex_mode.vim
rename to test/old/testdir/test_ex_mode.vim
diff --git a/src/nvim/testdir/test_ex_undo.vim b/test/old/testdir/test_ex_undo.vim
similarity index 100%
rename from src/nvim/testdir/test_ex_undo.vim
rename to test/old/testdir/test_ex_undo.vim
diff --git a/src/nvim/testdir/test_ex_z.vim b/test/old/testdir/test_ex_z.vim
similarity index 100%
rename from src/nvim/testdir/test_ex_z.vim
rename to test/old/testdir/test_ex_z.vim
diff --git a/src/nvim/testdir/test_excmd.vim b/test/old/testdir/test_excmd.vim
similarity index 100%
rename from src/nvim/testdir/test_excmd.vim
rename to test/old/testdir/test_excmd.vim
diff --git a/src/nvim/testdir/test_exec_while_if.vim b/test/old/testdir/test_exec_while_if.vim
similarity index 100%
rename from src/nvim/testdir/test_exec_while_if.vim
rename to test/old/testdir/test_exec_while_if.vim
diff --git a/src/nvim/testdir/test_execute_func.vim b/test/old/testdir/test_execute_func.vim
similarity index 100%
rename from src/nvim/testdir/test_execute_func.vim
rename to test/old/testdir/test_execute_func.vim
diff --git a/src/nvim/testdir/test_exists.vim b/test/old/testdir/test_exists.vim
similarity index 100%
rename from src/nvim/testdir/test_exists.vim
rename to test/old/testdir/test_exists.vim
diff --git a/src/nvim/testdir/test_exists_autocmd.vim b/test/old/testdir/test_exists_autocmd.vim
similarity index 100%
rename from src/nvim/testdir/test_exists_autocmd.vim
rename to test/old/testdir/test_exists_autocmd.vim
diff --git a/src/nvim/testdir/test_exit.vim b/test/old/testdir/test_exit.vim
similarity index 100%
rename from src/nvim/testdir/test_exit.vim
rename to test/old/testdir/test_exit.vim
diff --git a/src/nvim/testdir/test_expand.vim b/test/old/testdir/test_expand.vim
similarity index 100%
rename from src/nvim/testdir/test_expand.vim
rename to test/old/testdir/test_expand.vim
diff --git a/src/nvim/testdir/test_expand_func.vim b/test/old/testdir/test_expand_func.vim
similarity index 100%
rename from src/nvim/testdir/test_expand_func.vim
rename to test/old/testdir/test_expand_func.vim
diff --git a/src/nvim/testdir/test_expr.vim b/test/old/testdir/test_expr.vim
similarity index 100%
rename from src/nvim/testdir/test_expr.vim
rename to test/old/testdir/test_expr.vim
diff --git a/src/nvim/testdir/test_expr_utf8.vim b/test/old/testdir/test_expr_utf8.vim
similarity index 100%
rename from src/nvim/testdir/test_expr_utf8.vim
rename to test/old/testdir/test_expr_utf8.vim
diff --git a/src/nvim/testdir/test_file_perm.vim b/test/old/testdir/test_file_perm.vim
similarity index 100%
rename from src/nvim/testdir/test_file_perm.vim
rename to test/old/testdir/test_file_perm.vim
diff --git a/src/nvim/testdir/test_file_size.vim b/test/old/testdir/test_file_size.vim
similarity index 100%
rename from src/nvim/testdir/test_file_size.vim
rename to test/old/testdir/test_file_size.vim
diff --git a/src/nvim/testdir/test_filechanged.vim b/test/old/testdir/test_filechanged.vim
similarity index 100%
rename from src/nvim/testdir/test_filechanged.vim
rename to test/old/testdir/test_filechanged.vim
diff --git a/src/nvim/testdir/test_fileformat.vim b/test/old/testdir/test_fileformat.vim
similarity index 100%
rename from src/nvim/testdir/test_fileformat.vim
rename to test/old/testdir/test_fileformat.vim
diff --git a/src/nvim/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
similarity index 100%
rename from src/nvim/testdir/test_filetype.vim
rename to test/old/testdir/test_filetype.vim
diff --git a/src/nvim/testdir/test_filter_cmd.vim b/test/old/testdir/test_filter_cmd.vim
similarity index 100%
rename from src/nvim/testdir/test_filter_cmd.vim
rename to test/old/testdir/test_filter_cmd.vim
diff --git a/src/nvim/testdir/test_filter_map.vim b/test/old/testdir/test_filter_map.vim
similarity index 100%
rename from src/nvim/testdir/test_filter_map.vim
rename to test/old/testdir/test_filter_map.vim
diff --git a/src/nvim/testdir/test_find_complete.vim b/test/old/testdir/test_find_complete.vim
similarity index 100%
rename from src/nvim/testdir/test_find_complete.vim
rename to test/old/testdir/test_find_complete.vim
diff --git a/src/nvim/testdir/test_findfile.vim b/test/old/testdir/test_findfile.vim
similarity index 100%
rename from src/nvim/testdir/test_findfile.vim
rename to test/old/testdir/test_findfile.vim
diff --git a/src/nvim/testdir/test_fixeol.vim b/test/old/testdir/test_fixeol.vim
similarity index 100%
rename from src/nvim/testdir/test_fixeol.vim
rename to test/old/testdir/test_fixeol.vim
diff --git a/src/nvim/testdir/test_flatten.vim b/test/old/testdir/test_flatten.vim
similarity index 100%
rename from src/nvim/testdir/test_flatten.vim
rename to test/old/testdir/test_flatten.vim
diff --git a/src/nvim/testdir/test_float_func.vim b/test/old/testdir/test_float_func.vim
similarity index 100%
rename from src/nvim/testdir/test_float_func.vim
rename to test/old/testdir/test_float_func.vim
diff --git a/src/nvim/testdir/test_fnameescape.vim b/test/old/testdir/test_fnameescape.vim
similarity index 100%
rename from src/nvim/testdir/test_fnameescape.vim
rename to test/old/testdir/test_fnameescape.vim
diff --git a/src/nvim/testdir/test_fnamemodify.vim b/test/old/testdir/test_fnamemodify.vim
similarity index 100%
rename from src/nvim/testdir/test_fnamemodify.vim
rename to test/old/testdir/test_fnamemodify.vim
diff --git a/src/nvim/testdir/test_fold.vim b/test/old/testdir/test_fold.vim
similarity index 100%
rename from src/nvim/testdir/test_fold.vim
rename to test/old/testdir/test_fold.vim
diff --git a/src/nvim/testdir/test_functions.vim b/test/old/testdir/test_functions.vim
similarity index 100%
rename from src/nvim/testdir/test_functions.vim
rename to test/old/testdir/test_functions.vim
diff --git a/src/nvim/testdir/test_ga.vim b/test/old/testdir/test_ga.vim
similarity index 100%
rename from src/nvim/testdir/test_ga.vim
rename to test/old/testdir/test_ga.vim
diff --git a/src/nvim/testdir/test_getcwd.vim b/test/old/testdir/test_getcwd.vim
similarity index 100%
rename from src/nvim/testdir/test_getcwd.vim
rename to test/old/testdir/test_getcwd.vim
diff --git a/src/nvim/testdir/test_getvar.vim b/test/old/testdir/test_getvar.vim
similarity index 100%
rename from src/nvim/testdir/test_getvar.vim
rename to test/old/testdir/test_getvar.vim
diff --git a/src/nvim/testdir/test_gf.vim b/test/old/testdir/test_gf.vim
similarity index 100%
rename from src/nvim/testdir/test_gf.vim
rename to test/old/testdir/test_gf.vim
diff --git a/src/nvim/testdir/test_glob2regpat.vim b/test/old/testdir/test_glob2regpat.vim
similarity index 100%
rename from src/nvim/testdir/test_glob2regpat.vim
rename to test/old/testdir/test_glob2regpat.vim
diff --git a/src/nvim/testdir/test_global.vim b/test/old/testdir/test_global.vim
similarity index 100%
rename from src/nvim/testdir/test_global.vim
rename to test/old/testdir/test_global.vim
diff --git a/src/nvim/testdir/test_gn.vim b/test/old/testdir/test_gn.vim
similarity index 100%
rename from src/nvim/testdir/test_gn.vim
rename to test/old/testdir/test_gn.vim
diff --git a/src/nvim/testdir/test_goto.vim b/test/old/testdir/test_goto.vim
similarity index 100%
rename from src/nvim/testdir/test_goto.vim
rename to test/old/testdir/test_goto.vim
diff --git a/src/nvim/testdir/test_gui.vim b/test/old/testdir/test_gui.vim
similarity index 100%
rename from src/nvim/testdir/test_gui.vim
rename to test/old/testdir/test_gui.vim
diff --git a/src/nvim/testdir/test_help.vim b/test/old/testdir/test_help.vim
similarity index 100%
rename from src/nvim/testdir/test_help.vim
rename to test/old/testdir/test_help.vim
diff --git a/src/nvim/testdir/test_help_tagjump.vim b/test/old/testdir/test_help_tagjump.vim
similarity index 100%
rename from src/nvim/testdir/test_help_tagjump.vim
rename to test/old/testdir/test_help_tagjump.vim
diff --git a/src/nvim/testdir/test_hide.vim b/test/old/testdir/test_hide.vim
similarity index 100%
rename from src/nvim/testdir/test_hide.vim
rename to test/old/testdir/test_hide.vim
diff --git a/src/nvim/testdir/test_highlight.vim b/test/old/testdir/test_highlight.vim
similarity index 100%
rename from src/nvim/testdir/test_highlight.vim
rename to test/old/testdir/test_highlight.vim
diff --git a/src/nvim/testdir/test_history.vim b/test/old/testdir/test_history.vim
similarity index 100%
rename from src/nvim/testdir/test_history.vim
rename to test/old/testdir/test_history.vim
diff --git a/src/nvim/testdir/test_hlsearch.vim b/test/old/testdir/test_hlsearch.vim
similarity index 100%
rename from src/nvim/testdir/test_hlsearch.vim
rename to test/old/testdir/test_hlsearch.vim
diff --git a/src/nvim/testdir/test_increment.vim b/test/old/testdir/test_increment.vim
similarity index 100%
rename from src/nvim/testdir/test_increment.vim
rename to test/old/testdir/test_increment.vim
diff --git a/src/nvim/testdir/test_increment_dbcs.vim b/test/old/testdir/test_increment_dbcs.vim
similarity index 100%
rename from src/nvim/testdir/test_increment_dbcs.vim
rename to test/old/testdir/test_increment_dbcs.vim
diff --git a/src/nvim/testdir/test_indent.vim b/test/old/testdir/test_indent.vim
similarity index 100%
rename from src/nvim/testdir/test_indent.vim
rename to test/old/testdir/test_indent.vim
diff --git a/src/nvim/testdir/test_input.vim b/test/old/testdir/test_input.vim
similarity index 100%
rename from src/nvim/testdir/test_input.vim
rename to test/old/testdir/test_input.vim
diff --git a/src/nvim/testdir/test_ins_complete.vim b/test/old/testdir/test_ins_complete.vim
similarity index 100%
rename from src/nvim/testdir/test_ins_complete.vim
rename to test/old/testdir/test_ins_complete.vim
diff --git a/src/nvim/testdir/test_ins_complete_no_halt.vim b/test/old/testdir/test_ins_complete_no_halt.vim
similarity index 100%
rename from src/nvim/testdir/test_ins_complete_no_halt.vim
rename to test/old/testdir/test_ins_complete_no_halt.vim
diff --git a/src/nvim/testdir/test_interrupt.vim b/test/old/testdir/test_interrupt.vim
similarity index 100%
rename from src/nvim/testdir/test_interrupt.vim
rename to test/old/testdir/test_interrupt.vim
diff --git a/src/nvim/testdir/test_join.vim b/test/old/testdir/test_join.vim
similarity index 100%
rename from src/nvim/testdir/test_join.vim
rename to test/old/testdir/test_join.vim
diff --git a/src/nvim/testdir/test_jumplist.vim b/test/old/testdir/test_jumplist.vim
similarity index 100%
rename from src/nvim/testdir/test_jumplist.vim
rename to test/old/testdir/test_jumplist.vim
diff --git a/src/nvim/testdir/test_lambda.vim b/test/old/testdir/test_lambda.vim
similarity index 100%
rename from src/nvim/testdir/test_lambda.vim
rename to test/old/testdir/test_lambda.vim
diff --git a/src/nvim/testdir/test_langmap.vim b/test/old/testdir/test_langmap.vim
similarity index 100%
rename from src/nvim/testdir/test_langmap.vim
rename to test/old/testdir/test_langmap.vim
diff --git a/src/nvim/testdir/test_largefile.vim b/test/old/testdir/test_largefile.vim
similarity index 100%
rename from src/nvim/testdir/test_largefile.vim
rename to test/old/testdir/test_largefile.vim
diff --git a/src/nvim/testdir/test_let.vim b/test/old/testdir/test_let.vim
similarity index 100%
rename from src/nvim/testdir/test_let.vim
rename to test/old/testdir/test_let.vim
diff --git a/src/nvim/testdir/test_lineending.vim b/test/old/testdir/test_lineending.vim
similarity index 100%
rename from src/nvim/testdir/test_lineending.vim
rename to test/old/testdir/test_lineending.vim
diff --git a/src/nvim/testdir/test_lispindent.vim b/test/old/testdir/test_lispindent.vim
similarity index 100%
rename from src/nvim/testdir/test_lispindent.vim
rename to test/old/testdir/test_lispindent.vim
diff --git a/src/nvim/testdir/test_listchars.vim b/test/old/testdir/test_listchars.vim
similarity index 100%
rename from src/nvim/testdir/test_listchars.vim
rename to test/old/testdir/test_listchars.vim
diff --git a/src/nvim/testdir/test_listdict.vim b/test/old/testdir/test_listdict.vim
similarity index 100%
rename from src/nvim/testdir/test_listdict.vim
rename to test/old/testdir/test_listdict.vim
diff --git a/src/nvim/testdir/test_listlbr.vim b/test/old/testdir/test_listlbr.vim
similarity index 100%
rename from src/nvim/testdir/test_listlbr.vim
rename to test/old/testdir/test_listlbr.vim
diff --git a/src/nvim/testdir/test_listlbr_utf8.vim b/test/old/testdir/test_listlbr_utf8.vim
similarity index 100%
rename from src/nvim/testdir/test_listlbr_utf8.vim
rename to test/old/testdir/test_listlbr_utf8.vim
diff --git a/src/nvim/testdir/test_makeencoding.py b/test/old/testdir/test_makeencoding.py
similarity index 100%
rename from src/nvim/testdir/test_makeencoding.py
rename to test/old/testdir/test_makeencoding.py
diff --git a/src/nvim/testdir/test_makeencoding.vim b/test/old/testdir/test_makeencoding.vim
similarity index 100%
rename from src/nvim/testdir/test_makeencoding.vim
rename to test/old/testdir/test_makeencoding.vim
diff --git a/src/nvim/testdir/test_maparg.vim b/test/old/testdir/test_maparg.vim
similarity index 100%
rename from src/nvim/testdir/test_maparg.vim
rename to test/old/testdir/test_maparg.vim
diff --git a/src/nvim/testdir/test_mapping.vim b/test/old/testdir/test_mapping.vim
similarity index 100%
rename from src/nvim/testdir/test_mapping.vim
rename to test/old/testdir/test_mapping.vim
diff --git a/src/nvim/testdir/test_marks.vim b/test/old/testdir/test_marks.vim
similarity index 100%
rename from src/nvim/testdir/test_marks.vim
rename to test/old/testdir/test_marks.vim
diff --git a/src/nvim/testdir/test_match.vim b/test/old/testdir/test_match.vim
similarity index 100%
rename from src/nvim/testdir/test_match.vim
rename to test/old/testdir/test_match.vim
diff --git a/src/nvim/testdir/test_matchadd_conceal.vim b/test/old/testdir/test_matchadd_conceal.vim
similarity index 100%
rename from src/nvim/testdir/test_matchadd_conceal.vim
rename to test/old/testdir/test_matchadd_conceal.vim
diff --git a/src/nvim/testdir/test_matchadd_conceal_utf8.vim b/test/old/testdir/test_matchadd_conceal_utf8.vim
similarity index 100%
rename from src/nvim/testdir/test_matchadd_conceal_utf8.vim
rename to test/old/testdir/test_matchadd_conceal_utf8.vim
diff --git a/src/nvim/testdir/test_matchfuzzy.vim b/test/old/testdir/test_matchfuzzy.vim
similarity index 100%
rename from src/nvim/testdir/test_matchfuzzy.vim
rename to test/old/testdir/test_matchfuzzy.vim
diff --git a/src/nvim/testdir/test_menu.vim b/test/old/testdir/test_menu.vim
similarity index 100%
rename from src/nvim/testdir/test_menu.vim
rename to test/old/testdir/test_menu.vim
diff --git a/src/nvim/testdir/test_messages.vim b/test/old/testdir/test_messages.vim
similarity index 100%
rename from src/nvim/testdir/test_messages.vim
rename to test/old/testdir/test_messages.vim
diff --git a/src/nvim/testdir/test_method.vim b/test/old/testdir/test_method.vim
similarity index 100%
rename from src/nvim/testdir/test_method.vim
rename to test/old/testdir/test_method.vim
diff --git a/src/nvim/testdir/test_mksession.vim b/test/old/testdir/test_mksession.vim
similarity index 100%
rename from src/nvim/testdir/test_mksession.vim
rename to test/old/testdir/test_mksession.vim
diff --git a/src/nvim/testdir/test_mksession_utf8.vim b/test/old/testdir/test_mksession_utf8.vim
similarity index 100%
rename from src/nvim/testdir/test_mksession_utf8.vim
rename to test/old/testdir/test_mksession_utf8.vim
diff --git a/src/nvim/testdir/test_modeline.vim b/test/old/testdir/test_modeline.vim
similarity index 100%
rename from src/nvim/testdir/test_modeline.vim
rename to test/old/testdir/test_modeline.vim
diff --git a/src/nvim/testdir/test_move.vim b/test/old/testdir/test_move.vim
similarity index 100%
rename from src/nvim/testdir/test_move.vim
rename to test/old/testdir/test_move.vim
diff --git a/src/nvim/testdir/test_nested_function.vim b/test/old/testdir/test_nested_function.vim
similarity index 100%
rename from src/nvim/testdir/test_nested_function.vim
rename to test/old/testdir/test_nested_function.vim
diff --git a/src/nvim/testdir/test_normal.vim b/test/old/testdir/test_normal.vim
similarity index 100%
rename from src/nvim/testdir/test_normal.vim
rename to test/old/testdir/test_normal.vim
diff --git a/src/nvim/testdir/test_number.vim b/test/old/testdir/test_number.vim
similarity index 100%
rename from src/nvim/testdir/test_number.vim
rename to test/old/testdir/test_number.vim
diff --git a/src/nvim/testdir/test_options.vim b/test/old/testdir/test_options.vim
similarity index 100%
rename from src/nvim/testdir/test_options.vim
rename to test/old/testdir/test_options.vim
diff --git a/src/nvim/testdir/test_packadd.vim b/test/old/testdir/test_packadd.vim
similarity index 100%
rename from src/nvim/testdir/test_packadd.vim
rename to test/old/testdir/test_packadd.vim
diff --git a/src/nvim/testdir/test_partial.vim b/test/old/testdir/test_partial.vim
similarity index 100%
rename from src/nvim/testdir/test_partial.vim
rename to test/old/testdir/test_partial.vim
diff --git a/src/nvim/testdir/test_paste.vim b/test/old/testdir/test_paste.vim
similarity index 100%
rename from src/nvim/testdir/test_paste.vim
rename to test/old/testdir/test_paste.vim
diff --git a/src/nvim/testdir/test_perl.vim b/test/old/testdir/test_perl.vim
similarity index 100%
rename from src/nvim/testdir/test_perl.vim
rename to test/old/testdir/test_perl.vim
diff --git a/src/nvim/testdir/test_plus_arg_edit.vim b/test/old/testdir/test_plus_arg_edit.vim
similarity index 100%
rename from src/nvim/testdir/test_plus_arg_edit.vim
rename to test/old/testdir/test_plus_arg_edit.vim
diff --git a/src/nvim/testdir/test_popup.vim b/test/old/testdir/test_popup.vim
similarity index 100%
rename from src/nvim/testdir/test_popup.vim
rename to test/old/testdir/test_popup.vim
diff --git a/src/nvim/testdir/test_preview.vim b/test/old/testdir/test_preview.vim
similarity index 100%
rename from src/nvim/testdir/test_preview.vim
rename to test/old/testdir/test_preview.vim
diff --git a/src/nvim/testdir/test_profile.vim b/test/old/testdir/test_profile.vim
similarity index 100%
rename from src/nvim/testdir/test_profile.vim
rename to test/old/testdir/test_profile.vim
diff --git a/src/nvim/testdir/test_prompt_buffer.vim b/test/old/testdir/test_prompt_buffer.vim
similarity index 100%
rename from src/nvim/testdir/test_prompt_buffer.vim
rename to test/old/testdir/test_prompt_buffer.vim
diff --git a/src/nvim/testdir/test_put.vim b/test/old/testdir/test_put.vim
similarity index 100%
rename from src/nvim/testdir/test_put.vim
rename to test/old/testdir/test_put.vim
diff --git a/src/nvim/testdir/test_python2.vim b/test/old/testdir/test_python2.vim
similarity index 100%
rename from src/nvim/testdir/test_python2.vim
rename to test/old/testdir/test_python2.vim
diff --git a/src/nvim/testdir/test_python3.vim b/test/old/testdir/test_python3.vim
similarity index 100%
rename from src/nvim/testdir/test_python3.vim
rename to test/old/testdir/test_python3.vim
diff --git a/src/nvim/testdir/test_pyx2.vim b/test/old/testdir/test_pyx2.vim
similarity index 100%
rename from src/nvim/testdir/test_pyx2.vim
rename to test/old/testdir/test_pyx2.vim
diff --git a/src/nvim/testdir/test_pyx3.vim b/test/old/testdir/test_pyx3.vim
similarity index 100%
rename from src/nvim/testdir/test_pyx3.vim
rename to test/old/testdir/test_pyx3.vim
diff --git a/src/nvim/testdir/test_quickfix.vim b/test/old/testdir/test_quickfix.vim
similarity index 100%
rename from src/nvim/testdir/test_quickfix.vim
rename to test/old/testdir/test_quickfix.vim
diff --git a/src/nvim/testdir/test_quotestar.vim b/test/old/testdir/test_quotestar.vim
similarity index 100%
rename from src/nvim/testdir/test_quotestar.vim
rename to test/old/testdir/test_quotestar.vim
diff --git a/src/nvim/testdir/test_random.vim b/test/old/testdir/test_random.vim
similarity index 100%
rename from src/nvim/testdir/test_random.vim
rename to test/old/testdir/test_random.vim
diff --git a/src/nvim/testdir/test_recover.vim b/test/old/testdir/test_recover.vim
similarity index 100%
rename from src/nvim/testdir/test_recover.vim
rename to test/old/testdir/test_recover.vim
diff --git a/src/nvim/testdir/test_regex_char_classes.vim b/test/old/testdir/test_regex_char_classes.vim
similarity index 100%
rename from src/nvim/testdir/test_regex_char_classes.vim
rename to test/old/testdir/test_regex_char_classes.vim
diff --git a/src/nvim/testdir/test_regexp_latin.vim b/test/old/testdir/test_regexp_latin.vim
similarity index 100%
rename from src/nvim/testdir/test_regexp_latin.vim
rename to test/old/testdir/test_regexp_latin.vim
diff --git a/src/nvim/testdir/test_regexp_utf8.vim b/test/old/testdir/test_regexp_utf8.vim
similarity index 100%
rename from src/nvim/testdir/test_regexp_utf8.vim
rename to test/old/testdir/test_regexp_utf8.vim
diff --git a/src/nvim/testdir/test_registers.vim b/test/old/testdir/test_registers.vim
similarity index 100%
rename from src/nvim/testdir/test_registers.vim
rename to test/old/testdir/test_registers.vim
diff --git a/src/nvim/testdir/test_reltime.vim b/test/old/testdir/test_reltime.vim
similarity index 100%
rename from src/nvim/testdir/test_reltime.vim
rename to test/old/testdir/test_reltime.vim
diff --git a/src/nvim/testdir/test_rename.vim b/test/old/testdir/test_rename.vim
similarity index 100%
rename from src/nvim/testdir/test_rename.vim
rename to test/old/testdir/test_rename.vim
diff --git a/src/nvim/testdir/test_retab.vim b/test/old/testdir/test_retab.vim
similarity index 100%
rename from src/nvim/testdir/test_retab.vim
rename to test/old/testdir/test_retab.vim
diff --git a/src/nvim/testdir/test_ruby.vim b/test/old/testdir/test_ruby.vim
similarity index 100%
rename from src/nvim/testdir/test_ruby.vim
rename to test/old/testdir/test_ruby.vim
diff --git a/src/nvim/testdir/test_scriptnames.vim b/test/old/testdir/test_scriptnames.vim
similarity index 100%
rename from src/nvim/testdir/test_scriptnames.vim
rename to test/old/testdir/test_scriptnames.vim
diff --git a/src/nvim/testdir/test_scroll_opt.vim b/test/old/testdir/test_scroll_opt.vim
similarity index 100%
rename from src/nvim/testdir/test_scroll_opt.vim
rename to test/old/testdir/test_scroll_opt.vim
diff --git a/src/nvim/testdir/test_scrollbind.vim b/test/old/testdir/test_scrollbind.vim
similarity index 100%
rename from src/nvim/testdir/test_scrollbind.vim
rename to test/old/testdir/test_scrollbind.vim
diff --git a/src/nvim/testdir/test_search.vim b/test/old/testdir/test_search.vim
similarity index 100%
rename from src/nvim/testdir/test_search.vim
rename to test/old/testdir/test_search.vim
diff --git a/src/nvim/testdir/test_search_stat.vim b/test/old/testdir/test_search_stat.vim
similarity index 100%
rename from src/nvim/testdir/test_search_stat.vim
rename to test/old/testdir/test_search_stat.vim
diff --git a/src/nvim/testdir/test_searchpos.vim b/test/old/testdir/test_searchpos.vim
similarity index 100%
rename from src/nvim/testdir/test_searchpos.vim
rename to test/old/testdir/test_searchpos.vim
diff --git a/src/nvim/testdir/test_selectmode.vim b/test/old/testdir/test_selectmode.vim
similarity index 100%
rename from src/nvim/testdir/test_selectmode.vim
rename to test/old/testdir/test_selectmode.vim
diff --git a/src/nvim/testdir/test_set.vim b/test/old/testdir/test_set.vim
similarity index 100%
rename from src/nvim/testdir/test_set.vim
rename to test/old/testdir/test_set.vim
diff --git a/src/nvim/testdir/test_sha256.vim b/test/old/testdir/test_sha256.vim
similarity index 100%
rename from src/nvim/testdir/test_sha256.vim
rename to test/old/testdir/test_sha256.vim
diff --git a/src/nvim/testdir/test_shell.vim b/test/old/testdir/test_shell.vim
similarity index 100%
rename from src/nvim/testdir/test_shell.vim
rename to test/old/testdir/test_shell.vim
diff --git a/src/nvim/testdir/test_shift.vim b/test/old/testdir/test_shift.vim
similarity index 100%
rename from src/nvim/testdir/test_shift.vim
rename to test/old/testdir/test_shift.vim
diff --git a/src/nvim/testdir/test_signals.vim b/test/old/testdir/test_signals.vim
similarity index 100%
rename from src/nvim/testdir/test_signals.vim
rename to test/old/testdir/test_signals.vim
diff --git a/src/nvim/testdir/test_signs.vim b/test/old/testdir/test_signs.vim
similarity index 100%
rename from src/nvim/testdir/test_signs.vim
rename to test/old/testdir/test_signs.vim
diff --git a/src/nvim/testdir/test_sleep.vim b/test/old/testdir/test_sleep.vim
similarity index 100%
rename from src/nvim/testdir/test_sleep.vim
rename to test/old/testdir/test_sleep.vim
diff --git a/src/nvim/testdir/test_smartindent.vim b/test/old/testdir/test_smartindent.vim
similarity index 100%
rename from src/nvim/testdir/test_smartindent.vim
rename to test/old/testdir/test_smartindent.vim
diff --git a/src/nvim/testdir/test_sort.vim b/test/old/testdir/test_sort.vim
similarity index 100%
rename from src/nvim/testdir/test_sort.vim
rename to test/old/testdir/test_sort.vim
diff --git a/src/nvim/testdir/test_source.vim b/test/old/testdir/test_source.vim
similarity index 100%
rename from src/nvim/testdir/test_source.vim
rename to test/old/testdir/test_source.vim
diff --git a/src/nvim/testdir/test_source_utf8.vim b/test/old/testdir/test_source_utf8.vim
similarity index 100%
rename from src/nvim/testdir/test_source_utf8.vim
rename to test/old/testdir/test_source_utf8.vim
diff --git a/src/nvim/testdir/test_spell.vim b/test/old/testdir/test_spell.vim
similarity index 100%
rename from src/nvim/testdir/test_spell.vim
rename to test/old/testdir/test_spell.vim
diff --git a/src/nvim/testdir/test_spell_utf8.vim b/test/old/testdir/test_spell_utf8.vim
similarity index 100%
rename from src/nvim/testdir/test_spell_utf8.vim
rename to test/old/testdir/test_spell_utf8.vim
diff --git a/src/nvim/testdir/test_spellfile.vim b/test/old/testdir/test_spellfile.vim
similarity index 100%
rename from src/nvim/testdir/test_spellfile.vim
rename to test/old/testdir/test_spellfile.vim
diff --git a/src/nvim/testdir/test_startup.vim b/test/old/testdir/test_startup.vim
similarity index 100%
rename from src/nvim/testdir/test_startup.vim
rename to test/old/testdir/test_startup.vim
diff --git a/src/nvim/testdir/test_startup_utf8.vim b/test/old/testdir/test_startup_utf8.vim
similarity index 100%
rename from src/nvim/testdir/test_startup_utf8.vim
rename to test/old/testdir/test_startup_utf8.vim
diff --git a/src/nvim/testdir/test_stat.vim b/test/old/testdir/test_stat.vim
similarity index 100%
rename from src/nvim/testdir/test_stat.vim
rename to test/old/testdir/test_stat.vim
diff --git a/src/nvim/testdir/test_statusline.vim b/test/old/testdir/test_statusline.vim
similarity index 100%
rename from src/nvim/testdir/test_statusline.vim
rename to test/old/testdir/test_statusline.vim
diff --git a/src/nvim/testdir/test_substitute.vim b/test/old/testdir/test_substitute.vim
similarity index 100%
rename from src/nvim/testdir/test_substitute.vim
rename to test/old/testdir/test_substitute.vim
diff --git a/src/nvim/testdir/test_suspend.vim b/test/old/testdir/test_suspend.vim
similarity index 100%
rename from src/nvim/testdir/test_suspend.vim
rename to test/old/testdir/test_suspend.vim
diff --git a/src/nvim/testdir/test_swap.vim b/test/old/testdir/test_swap.vim
similarity index 100%
rename from src/nvim/testdir/test_swap.vim
rename to test/old/testdir/test_swap.vim
diff --git a/src/nvim/testdir/test_syn_attr.vim b/test/old/testdir/test_syn_attr.vim
similarity index 100%
rename from src/nvim/testdir/test_syn_attr.vim
rename to test/old/testdir/test_syn_attr.vim
diff --git a/src/nvim/testdir/test_syntax.vim b/test/old/testdir/test_syntax.vim
similarity index 100%
rename from src/nvim/testdir/test_syntax.vim
rename to test/old/testdir/test_syntax.vim
diff --git a/src/nvim/testdir/test_system.vim b/test/old/testdir/test_system.vim
similarity index 100%
rename from src/nvim/testdir/test_system.vim
rename to test/old/testdir/test_system.vim
diff --git a/src/nvim/testdir/test_tab.vim b/test/old/testdir/test_tab.vim
similarity index 100%
rename from src/nvim/testdir/test_tab.vim
rename to test/old/testdir/test_tab.vim
diff --git a/src/nvim/testdir/test_tabline.vim b/test/old/testdir/test_tabline.vim
similarity index 100%
rename from src/nvim/testdir/test_tabline.vim
rename to test/old/testdir/test_tabline.vim
diff --git a/src/nvim/testdir/test_tabpage.vim b/test/old/testdir/test_tabpage.vim
similarity index 100%
rename from src/nvim/testdir/test_tabpage.vim
rename to test/old/testdir/test_tabpage.vim
diff --git a/src/nvim/testdir/test_tagcase.vim b/test/old/testdir/test_tagcase.vim
similarity index 100%
rename from src/nvim/testdir/test_tagcase.vim
rename to test/old/testdir/test_tagcase.vim
diff --git a/src/nvim/testdir/test_tagfunc.vim b/test/old/testdir/test_tagfunc.vim
similarity index 100%
rename from src/nvim/testdir/test_tagfunc.vim
rename to test/old/testdir/test_tagfunc.vim
diff --git a/src/nvim/testdir/test_tagjump.vim b/test/old/testdir/test_tagjump.vim
similarity index 100%
rename from src/nvim/testdir/test_tagjump.vim
rename to test/old/testdir/test_tagjump.vim
diff --git a/src/nvim/testdir/test_taglist.vim b/test/old/testdir/test_taglist.vim
similarity index 100%
rename from src/nvim/testdir/test_taglist.vim
rename to test/old/testdir/test_taglist.vim
diff --git a/src/nvim/testdir/test_termcodes.vim b/test/old/testdir/test_termcodes.vim
similarity index 100%
rename from src/nvim/testdir/test_termcodes.vim
rename to test/old/testdir/test_termcodes.vim
diff --git a/src/nvim/testdir/test_textformat.vim b/test/old/testdir/test_textformat.vim
similarity index 100%
rename from src/nvim/testdir/test_textformat.vim
rename to test/old/testdir/test_textformat.vim
diff --git a/src/nvim/testdir/test_textobjects.vim b/test/old/testdir/test_textobjects.vim
similarity index 100%
rename from src/nvim/testdir/test_textobjects.vim
rename to test/old/testdir/test_textobjects.vim
diff --git a/src/nvim/testdir/test_timers.vim b/test/old/testdir/test_timers.vim
similarity index 100%
rename from src/nvim/testdir/test_timers.vim
rename to test/old/testdir/test_timers.vim
diff --git a/src/nvim/testdir/test_true_false.vim b/test/old/testdir/test_true_false.vim
similarity index 100%
rename from src/nvim/testdir/test_true_false.vim
rename to test/old/testdir/test_true_false.vim
diff --git a/src/nvim/testdir/test_trycatch.vim b/test/old/testdir/test_trycatch.vim
similarity index 100%
rename from src/nvim/testdir/test_trycatch.vim
rename to test/old/testdir/test_trycatch.vim
diff --git a/src/nvim/testdir/test_undo.vim b/test/old/testdir/test_undo.vim
similarity index 100%
rename from src/nvim/testdir/test_undo.vim
rename to test/old/testdir/test_undo.vim
diff --git a/src/nvim/testdir/test_unlet.vim b/test/old/testdir/test_unlet.vim
similarity index 100%
rename from src/nvim/testdir/test_unlet.vim
rename to test/old/testdir/test_unlet.vim
diff --git a/src/nvim/testdir/test_user_func.vim b/test/old/testdir/test_user_func.vim
similarity index 100%
rename from src/nvim/testdir/test_user_func.vim
rename to test/old/testdir/test_user_func.vim
diff --git a/src/nvim/testdir/test_usercommands.vim b/test/old/testdir/test_usercommands.vim
similarity index 100%
rename from src/nvim/testdir/test_usercommands.vim
rename to test/old/testdir/test_usercommands.vim
diff --git a/src/nvim/testdir/test_utf8.vim b/test/old/testdir/test_utf8.vim
similarity index 100%
rename from src/nvim/testdir/test_utf8.vim
rename to test/old/testdir/test_utf8.vim
diff --git a/src/nvim/testdir/test_utf8_comparisons.vim b/test/old/testdir/test_utf8_comparisons.vim
similarity index 100%
rename from src/nvim/testdir/test_utf8_comparisons.vim
rename to test/old/testdir/test_utf8_comparisons.vim
diff --git a/src/nvim/testdir/test_vartabs.vim b/test/old/testdir/test_vartabs.vim
similarity index 100%
rename from src/nvim/testdir/test_vartabs.vim
rename to test/old/testdir/test_vartabs.vim
diff --git a/src/nvim/testdir/test_version.vim b/test/old/testdir/test_version.vim
similarity index 100%
rename from src/nvim/testdir/test_version.vim
rename to test/old/testdir/test_version.vim
diff --git a/src/nvim/testdir/test_viminfo.vim b/test/old/testdir/test_viminfo.vim
similarity index 100%
rename from src/nvim/testdir/test_viminfo.vim
rename to test/old/testdir/test_viminfo.vim
diff --git a/src/nvim/testdir/test_vimscript.vim b/test/old/testdir/test_vimscript.vim
similarity index 100%
rename from src/nvim/testdir/test_vimscript.vim
rename to test/old/testdir/test_vimscript.vim
diff --git a/src/nvim/testdir/test_virtualedit.vim b/test/old/testdir/test_virtualedit.vim
similarity index 100%
rename from src/nvim/testdir/test_virtualedit.vim
rename to test/old/testdir/test_virtualedit.vim
diff --git a/src/nvim/testdir/test_visual.vim b/test/old/testdir/test_visual.vim
similarity index 100%
rename from src/nvim/testdir/test_visual.vim
rename to test/old/testdir/test_visual.vim
diff --git a/src/nvim/testdir/test_winbuf_close.vim b/test/old/testdir/test_winbuf_close.vim
similarity index 100%
rename from src/nvim/testdir/test_winbuf_close.vim
rename to test/old/testdir/test_winbuf_close.vim
diff --git a/src/nvim/testdir/test_window_cmd.vim b/test/old/testdir/test_window_cmd.vim
similarity index 100%
rename from src/nvim/testdir/test_window_cmd.vim
rename to test/old/testdir/test_window_cmd.vim
diff --git a/src/nvim/testdir/test_window_id.vim b/test/old/testdir/test_window_id.vim
similarity index 100%
rename from src/nvim/testdir/test_window_id.vim
rename to test/old/testdir/test_window_id.vim
diff --git a/src/nvim/testdir/test_windows_home.vim b/test/old/testdir/test_windows_home.vim
similarity index 100%
rename from src/nvim/testdir/test_windows_home.vim
rename to test/old/testdir/test_windows_home.vim
diff --git a/src/nvim/testdir/test_wnext.vim b/test/old/testdir/test_wnext.vim
similarity index 100%
rename from src/nvim/testdir/test_wnext.vim
rename to test/old/testdir/test_wnext.vim
diff --git a/src/nvim/testdir/test_wordcount.vim b/test/old/testdir/test_wordcount.vim
similarity index 100%
rename from src/nvim/testdir/test_wordcount.vim
rename to test/old/testdir/test_wordcount.vim
diff --git a/src/nvim/testdir/test_writefile.vim b/test/old/testdir/test_writefile.vim
similarity index 100%
rename from src/nvim/testdir/test_writefile.vim
rename to test/old/testdir/test_writefile.vim
diff --git a/src/nvim/testdir/unix.vim b/test/old/testdir/unix.vim
similarity index 100%
rename from src/nvim/testdir/unix.vim
rename to test/old/testdir/unix.vim
diff --git a/src/nvim/testdir/view_util.vim b/test/old/testdir/view_util.vim
similarity index 100%
rename from src/nvim/testdir/view_util.vim
rename to test/old/testdir/view_util.vim
diff --git a/src/nvim/testdir/vim9.vim b/test/old/testdir/vim9.vim
similarity index 100%
rename from src/nvim/testdir/vim9.vim
rename to test/old/testdir/vim9.vim