diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index a338169..feb8ce3 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1136,6 +1136,7 @@
 
 func Test_popup_beval()
   CheckScreendump
+  CheckFeature balloon_eval
 
   let lines =<< trim END
 	call setline(1, range(1, 20))
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 9025f83..810dc5f 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1684,12 +1684,14 @@
   call feedkeys("\<C-W>w", 'tx')
   call assert_equal(termwin, win_getid())
 
-  set langmap=xjyk
-  call feedkeys("\<C-L>x", 'tx')
-  call assert_equal(thiswin, win_getid())
-  call feedkeys("\<C-W>y", 'tx')
-  call assert_equal(termwin, win_getid())
-  set langmap=
+  if has('langmap')
+    set langmap=xjyk
+    call feedkeys("\<C-L>x", 'tx')
+    call assert_equal(thiswin, win_getid())
+    call feedkeys("\<C-W>y", 'tx')
+    call assert_equal(termwin, win_getid())
+    set langmap=
+  endif
 
   call feedkeys("\<C-L>gt", "xt")
   call assert_equal(3, tabpagenr())
diff --git a/src/version.c b/src/version.c
index 76476bc..c7f8764 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2030,
+/**/
     2029,
 /**/
     2028,