diff --git a/src/testdir/setup.vim b/src/testdir/setup.vim
index dee3de2..a028401 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 2add596..d5623c4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2167,
+/**/
     2166,
 /**/
     2165,