diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 60805f1318..3cf2a506c9 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -117,6 +117,11 @@ set shellslash
 
 let s:srcdir = expand('%:p:h:h')
 
+if has('win32')
+  " avoid prompt that is long or contains a line break
+  let $PROMPT = '$P$G'
+endif
+
 " Prepare for calling test_garbagecollect_now().
 let v:testing = 1
 
diff --git a/src/version.c b/src/version.c
index 3847ec9b4a..e4e70243b6 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 */
+/**/
+    1267,
 /**/
     1266,
 /**/