diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 4f508a487..fa621f497 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -272,6 +272,7 @@ let s:flaky = [
       \ 'Test_paused()',
       \ 'Test_pipe_through_sort_all()',
       \ 'Test_pipe_through_sort_some()',
+      \ 'Test_popup_and_window_resize()',  " sometimes fails on Mac
       \ 'Test_quoteplus()',
       \ 'Test_quotestar()',
       \ 'Test_reltime()',
diff --git a/src/version.c b/src/version.c
index 99f86e70c..ac3942553 100644
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    298,
 /**/
     297,
 /**/