diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index a4c238e8a2..db6797d1b0 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -246,8 +246,7 @@ func RunTheTest(test)
   endif
 
   if filereadable('guidialogfile')
-    call add(v:errors, "Unexpected dialog:")
-    call add(v:errors, readfile('guidialogfile').join('\n'))
+    call add(v:errors, "Unexpected dialog: " .. readfile('guidialogfile')->join('<NL>'))
     call delete('guidialogfile')
   endif
 
diff --git a/src/testdir/test_ex_mode.vim b/src/testdir/test_ex_mode.vim
index d981ced6b8..fafdda8de3 100644
--- a/src/testdir/test_ex_mode.vim
+++ b/src/testdir/test_ex_mode.vim
@@ -261,6 +261,9 @@ func Test_empty_command_visual_mode()
   call assert_equal(1, RunVim([], [], '-u NONE -e -s -S Xexmodescript'))
 
   call delete('Xexmodescript')
+
+  " This may cause a dialog to be displayed for an empty command, ignore it.
+  call delete('guidialogfile')
 endfunc
 
 
diff --git a/src/version.c b/src/version.c
index 50c6ed3b0b..fb9f794f1e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5094,
 /**/
     5093,
 /**/