diff --git a/src/testdir/test_arglist.vim b/src/testdir/test_arglist.vim
index 7474d33..b1f2929 100644
--- a/src/testdir/test_arglist.vim
+++ b/src/testdir/test_arglist.vim
@@ -4,6 +4,10 @@
 source shared.vim
 source term_util.vim
 
+func Reset_arglist()
+  args a | %argd
+endfunc
+
 func Test_argidx()
   args a b c
   last
@@ -30,6 +34,8 @@
 endfunc
 
 func Test_argadd()
+  call Reset_arglist()
+
   %argdelete
   argadd a b c
   call assert_equal(0, argidx())
@@ -124,8 +130,7 @@
 " Test for [count]argument and [count]argdelete commands
 " Ported from the test_argument_count.in test script
 func Test_argument()
-  " Clean the argument list
-  arga a | %argd
+  call Reset_arglist()
 
   let save_hidden = &hidden
   set hidden
@@ -217,8 +222,7 @@
 endfunc
 
 func Test_list_arguments()
-  " Clean the argument list
-  arga a | %argd
+  call Reset_arglist()
 
   " four args half the screen width makes two lines with two columns
   let aarg = repeat('a', &columns / 2 - 4)
@@ -256,8 +260,7 @@
 " Test for 0argadd and 0argedit
 " Ported from the test_argument_0count.in test script
 func Test_zero_argadd()
-  " Clean the argument list
-  arga a | %argd
+  call Reset_arglist()
 
   arga a b c d
   2argu
@@ -284,10 +287,6 @@
   call assert_equal('file with spaces', expand('%'))
 endfunc
 
-func Reset_arglist()
-  args a | %argd
-endfunc
-
 " Test for argc()
 func Test_argc()
   call Reset_arglist()
diff --git a/src/version.c b/src/version.c
index b6299b8..ea1644d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3616,
+/**/
     3615,
 /**/
     3614,