diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 79207c8b26..be86fdc546 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -328,6 +328,7 @@ func Test_popup_select()
   endif
   " create a popup with some text to be selected
   let lines =<< trim END
+    set clipboard=autoselect
     call setline(1, range(1, 20))
     let winid = popup_create(['the word', 'some more', 'several words here'], {
 	  \ 'drag': 1,
diff --git a/src/version.c b/src/version.c
index 7d4d06d113..f379701ab0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1536,
 /**/
     1535,
 /**/