diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index 84808efa09..3d7245dc63 100644
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -9,6 +9,9 @@ function Test_messages()
     set nomore
     " Avoid the "message maintainer" line.
     let $LANG = ''
+    let $LC_ALL = ''
+    let $LC_MESSAGES = ''
+    let $LC_COLLATE = ''
 
     let arr = map(range(10), '"hello" . v:val')
     for s in arr
diff --git a/src/version.c b/src/version.c
index 28d317922a..3ba7452899 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    638,
 /**/
     637,
 /**/