diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index dee435c..3b6f662 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -49,6 +49,9 @@
 endfunc
 
 func Test_filetype_valid()
+  if !has('autocmd')
+    return
+  endif
   set ft=valid_name
   call assert_equal("valid_name", &filetype)
   set ft=valid-name
@@ -66,6 +69,9 @@
 endfunc
 
 func Test_syntax_valid()
+  if !has('syntax')
+    return
+  endif
   set syn=valid_name
   call assert_equal("valid_name", &syntax)
   set syn=valid-name
@@ -83,6 +89,9 @@
 endfunc
 
 func Test_keymap_valid()
+  if !has('keymap')
+    return
+  endif
   call assert_fails(":set kmp=valid_name", "E544:")
   call assert_fails(":set kmp=valid_name", "valid_name")
   call assert_fails(":set kmp=valid-name", "E544:")
diff --git a/src/version.c b/src/version.c
index f63041e..a6979fe 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    57,
+/**/
     56,
 /**/
     55,