diff -r d8d8e0306a08 -r 0e401fef9a3a src/testdir/test1.in
--- a/src/testdir/test1.in
+++ b/src/testdir/test1.in
@@ -11,8 +11,10 @@
 set like small.vim above.  tiny.vim is sourced by tests that require the
 +windows feature or other features that are missing in the tiny version.
 
-If Vim was not compiled with the +multi_byte feature, the mbyte.vim script will be set like small.vim above.  mbyte.vim is sourced by tests that require the
-+multi_byte feature.
+If Vim was not compiled with the +multi_byte feature, the mbyte.vim script
+will be set like small.vim above.  mbyte.vim is sourced by tests that require
+the +multi_byte feature.
+
 Similar logic is applied to the +mzscheme feature, using mzscheme.vim.
 
 STARTTEST
diff -r d8d8e0306a08 -r 0e401fef9a3a src/testdir/test17.ok
--- a/src/testdir/test17.ok
+++ b/src/testdir/test17.ok
@@ -1,3 +1,3 @@
 This file is just to test "gf" in test 17.
-The contents is not importent.
+The contents is not important.
 Just testing!
diff -r d8d8e0306a08 -r 0e401fef9a3a src/testdir/test17a.in
--- a/src/testdir/test17a.in
+++ b/src/testdir/test17a.in
@@ -1,3 +1,3 @@
 This file is just to test "gf" in test 17.
-The contents is not importent.
+The contents is not important.
 Just testing!
diff -r d8d8e0306a08 -r 0e401fef9a3a src/testdir/test30.in
--- a/src/testdir/test30.in
+++ b/src/testdir/test30.in
@@ -29,6 +29,11 @@
 : !copy XXUnix,XXMac XXUxMac.
 : !copy XXDos,XXMac  XXDosMac.
 : !copy XXUnix,XXDos,XXMac XXUxDsMc.
+:elseif has("win32")
+: !copy /b XXUnix+XXDos XXUxDs
+: !copy /b XXUnix+XXMac XXUxMac
+: !copy /b XXDos+XXMac XXDosMac
+: !copy /b XXUnix+XXDos+XXMac XXUxDsMc
 :else
 : !cat XXUnix XXDos >XXUxDs
 : !cat XXUnix XXMac >XXUxMac