diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim
index 9fb233c..0a7240b 100644
--- a/src/testdir/test_modeline.vim
+++ b/src/testdir/test_modeline.vim
@@ -164,7 +164,11 @@
 endfunc
 
 func s:modeline_fails(what, text, error)
-  call CheckOption(a:what)
+  " Don't use CheckOption(), it would skip the whole test
+  " just for a single un-supported option
+  if !exists('+' .. a:what)
+    return
+  endif
   let fname = "Xmodeline_fails_" . a:what
   call writefile(['vim: set ' . a:text . ' :', 'nothing'], fname, 'D')
   let modeline = &modeline
diff --git a/src/version.c b/src/version.c
index 0d46024..405689a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2093,
+/**/
     2092,
 /**/
     2091,