diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
new file mode 100644
index 0000000..23b0b26
--- /dev/null
+++ b/src/testdir/Make_vms.mms
@@ -0,0 +1,124 @@
+#
+# Makefile to run all tests for Vim on VMS
+#
+# Authors:	Zoltan Arpadffy, <arpadffy@polarhome.com>
+#		Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
+#
+# Last change:  2004 May 03
+#
+# This has been tested on VMS 6.2 to 7.2 on DEC Alpha and VAX.
+# Edit the lines in the Configuration section below to select.
+#
+# Execute with:
+#		mms/descrip=Make_vms.mms
+# Cleanup with:
+#		mms/descrip=Make_vms.mms clean
+#
+# Make files are MMK compatible.
+#
+# NOTE: You can run this script just in X/Window environment. It will
+# create a new terminals, therefore you have to set up your DISPLAY
+# logical. More info in VMS documentation or with: help set disp.
+#
+#######################################################################
+# Configuration section.
+#######################################################################
+
+# Uncomment if you want tests in GUI mode.  Terminal mode is default.
+# WANT_GUI  = YES
+
+# Comment out if you want to run Unix specific tests as well, but please
+# be aware, that on OpenVMS will fail, because of cat, rm, etc commands
+# and directory handling.
+# WANT_UNIX = YES
+
+# Comment out if you have gzip on your system
+# HAVE_GZIP = YES
+
+# Comment out if you have GNU compatible diff on your system
+# HAVE_GDIFF = YES
+
+#######################################################################
+# End of configuration section.
+#
+# Please, do not change anything below without programming experience.
+#######################################################################
+
+VIMPROG = <->vim.exe
+
+.SUFFIXES : .out .in
+
+SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.out  \
+	 test6.out  test7.out  test8.out  test9.out  test10a.out\
+	 test13.out test14.out test15.out test17.out \
+	 test18.out test19.out test20.out test21.out test22.out \
+	 test23.out test24.out test26.out \
+	 test28.out test29.out test31.out test32.out \
+	 test33.out test34.out test35.out test36.out test37.out \
+	 test38.out test39.out test40.out test41.out test42.out \
+	 test43.out test44.out test45.out test46.out \
+	 test48.out test51.out
+
+.IFDEF WANT_GUI
+SCRIPT_GUI = test16.out
+GUI_OPTION = -g
+.ENDIF
+
+.IFDEF WANT_UNIX
+SCRIPT_UNIX = test10.out test12.out test25.out test27.out test30.out test49.out
+.ENDIF
+
+.IFDEF HAVE_GZIP
+SCRIPT_GZIP = test11.out
+.ENDIF
+
+.IFDEF HAVE_GDIFF
+SCRIPT_GDIFF = test47.out
+.ENDIF
+
+.in.out :
+	-@ write sys$output " "
+	-@ write sys$output "-----------------------------------------------"
+	-@ write sys$output "                "$*" "
+	-@ write sys$output "-----------------------------------------------"
+	-@ create/term/wait mcr $(VIMPROG) $(GUI_OPTION) -u vms.vim --noplugin -s dotest.in $*.in
+	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then differences test.out $*.ok;
+	-@ if "''F$SEARCH("test.out.*")'" .NES. "" then rename test.out $*.out
+	-@ if "''F$SEARCH("Xdotest.*")'"  .NES. "" then delete/noconfirm/nolog Xdotest.*.*
+
+all : clean nolog $(SCRIPT) $(SCRIPT_GUI) $(SCRIPT_UNIX) $(SCRIPT_GZIP) $(SCRIPT_GDIFF)
+	-@ write sys$output " "
+	-@ write sys$output "-----------------------------------------------"
+	-@ write sys$output "                All done"
+	-@ write sys$output "-----------------------------------------------"
+	-@ deassign sys$output
+	-@ delete/noconfirm/nolog x*.*.*
+	-@ type test.log
+
+nolog :
+	-@ define sys$output test.log
+	-@ write sys$output "-----------------------------------------------"
+	-@ write sys$output "           Standard VIM test cases"
+	-@ write sys$output "-----------------------------------------------"
+	-@ write sys$output " OpenVMS version: ''F$GETSYI("VERSION")'"
+	-@ write sys$output " Vim version:"
+	-@ mcr $(VIMPROG) --version
+	-@ write sys$output " Test date:"
+	-@ show time
+	-@ write sys$output "-----------------------------------------------"
+	-@ write sys$output "                Test results:"
+	-@ write sys$output "-----------------------------------------------"
+	-@ write sys$output "MAKE_VMS.MMS options:"
+	-@ write sys$output "   WANT_GUI  = ""$(WANT_GUI)"" "
+	-@ write sys$output "   WANT_UNIX = ""$(WANT_UNIX)"" "
+	-@ write sys$output "   HAVE_GZIP = ""$(HAVE_GZIP)"" "
+	-@ write sys$output "   HAVE_GDIFF= ""$(HAVE_GDIFF)"" "
+	-@ write sys$output "Default vimrc file is VMS.VIM:
+	-@ write sys$output "-----------------------------------------------"
+	-@ type VMS.VIM
+
+clean :
+	-@ if "''F$SEARCH("*.out")'"     .NES. "" then delete/noconfirm/nolog *.out.*
+	-@ if "''F$SEARCH("test.log")'"  .NES. "" then delete/noconfirm/nolog test.log.*
+	-@ if "''F$SEARCH("Xdotest.*")'" .NES. "" then delete/noconfirm/nolog Xdotest.*.*
+	-@ if "''F$SEARCH("*.*_sw*")'"   .NES. "" then delete/noconfirm/nolog *.*_sw*.*