diff --git a/src/eval.c b/src/eval.c
index 4cb3289..c35def0 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8070,8 +8070,9 @@
     rettv->vval.v_string = NULL;
 
 #ifdef NO_CONSOLE_INPUT
-    /* While starting up, there is no place to enter text. */
-    if (no_console_input())
+    /* While starting up, there is no place to enter text. When running tests
+     * with --not-a-term we assume feedkeys() will be used. */
+    if (no_console_input() && !is_not_a_term())
 	return;
 #endif
 
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 422b94e..7a2e4aa 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -6482,8 +6482,9 @@
     int		mouse_used;
 
 #ifdef NO_CONSOLE_INPUT
-    /* While starting up, there is no place to enter text. */
-    if (no_console_input())
+    /* While starting up, there is no place to enter text. When running tests
+     * with --not-a-term we assume feedkeys() will be used. */
+    if (no_console_input() && !is_not_a_term())
 	return;
 #endif
     if (argvars[0].v_type != VAR_LIST || argvars[0].vval.v_list == NULL)
diff --git a/src/version.c b/src/version.c
index 86e8cc6..0648dd6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    804,
+/**/
     803,
 /**/
     802,