diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim
index dee3de212..a02840158 100644
--- a/src/testdir/setup.vim
+++ b/src/testdir/setup.vim
@@ -2,7 +2,9 @@
 
 " Make sure 'runtimepath' and 'packpath' does not include $HOME.
 set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after
-let &packpath = &rtp
+if has('packages')
+  let &packpath = &rtp
+endif
 
 " Only when the +eval feature is present. 
 if 1
diff --git a/src/version.c b/src/version.c
index 2add5968f..d5623c4cd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2167,
 /**/
     2166,
 /**/