diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 1371ccf..ff67102 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -1137,7 +1137,8 @@
 endfu
 
 func! Test_normal20_exmode()
-  if !(has("win32") || has("win64"))
+  if !has("unix")
+    " Reading from redirected file doesn't work on MS-Windows
     return
   endif
   call writefile(['1a', 'foo', 'bar', '.', 'w! Xfile2', 'q!'], 'Xscript')
@@ -1168,8 +1169,8 @@
 
 func! Test_normal22_zet()
   " Test for ZZ
-  let shell = &shell
-  let &shell = 'sh'
+  " let shell = &shell
+  " let &shell = 'sh'
   call writefile(['1', '2'], 'Xfile')
   let args = ' -u NONE -N -U NONE -i NONE --noplugins -X --not-a-term'
   call system(v:progpath . args . ' -c "%d" -c ":norm! ZZ" Xfile')
@@ -1185,7 +1186,7 @@
   for file in ['Xfile']
     call delete(file)
   endfor
-  let &shell = shell
+  " let &shell = shell
 endfu
 
 func! Test_normal23_K()
@@ -1206,7 +1207,8 @@
   call assert_match('\*version8\.0\*', getline('.'))
   helpclose
 
-  if !(has("win32") || has("win64"))
+  " Only expect "man" to work on Unix
+  if !has("unix")
     let &keywordprg = k
     bw!
     return
@@ -1642,6 +1644,7 @@
   call assert_equal('l', getreg(0))
 
   " Test for g Ctrl-G
+  set ff=unix
   let a=execute(":norm! g\<c-g>")
   call assert_match('Col 15 of 43; Line 2 of 2; Word 2 of 2; Byte 16 of 45', a)
 
@@ -1692,6 +1695,7 @@
 fun! Test_normal36_g_cmd5()
   new
   call append(0, 'abcdefghijklmnopqrstuvwxyz')
+  set ff=unix
   " Test for gp gP
   call append(1, range(1,10))
   1
diff --git a/src/version.c b/src/version.c
index 04cf59e..fd8d713 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2317,
+/**/
     2316,
 /**/
     2315,