diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index fbb725cb81..207ef9afe3 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -912,7 +912,7 @@ func Test_terminal_composing_unicode()
   endif
 
   enew
-  let buf = term_start(cmd, {'curwin': bufnr('')})
+  let buf = term_start(cmd, {'curwin': 1})
   let g:job = term_getjob(buf)
   call WaitFor({-> term_getline(buf, 1) !=# ''}, 1000)
 
diff --git a/src/testdir/test_terminal2.vim b/src/testdir/test_terminal2.vim
index 64310f6254..87d1e35652 100644
--- a/src/testdir/test_terminal2.vim
+++ b/src/testdir/test_terminal2.vim
@@ -560,8 +560,8 @@ func Test_term_gettty()
     endif
   endif
 
-  call assert_fails('call term_gettty(buf, 2)', 'E475:')
-  call assert_fails('call term_gettty(buf, -1)', 'E475:')
+  call assert_fails('call term_gettty(buf, 2)', 'E1023:')
+  call assert_fails('call term_gettty(buf, -1)', 'E1023:')
 
   call assert_equal('', term_gettty(buf + 1))
 
diff --git a/src/version.c b/src/version.c
index 4ba5e51e8e..b07e2a8dc6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1630,
 /**/
     1629,
 /**/