diff --git a/src/memline.c b/src/memline.c
index 4da7b431f..4c4a1b24c 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -1100,8 +1100,11 @@ swapfile_process_running(ZERO_BL *b0p, char_u *swap_fname UNUSED)
     // process can't be running now.
     if (mch_stat((char *)swap_fname, &st) != -1
 	    && sysinfo(&sinfo) == 0
-	    && st.st_mtime < time(NULL) - (override_sysinfo_uptime >= 0
-				     ? override_sysinfo_uptime : sinfo.uptime))
+	    && st.st_mtime < time(NULL) - (
+# ifdef FEAT_EVAL
+		override_sysinfo_uptime >= 0 ? override_sysinfo_uptime :
+# endif
+		sinfo.uptime))
 	return FALSE;
 #endif
     return mch_process_running(char_to_long(b0p->b0_pid));
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index b76949932..108c52854 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -459,6 +459,7 @@ NEW_TESTS_RES = \
 	test_quickfix.res \
 	test_quotestar.res \
 	test_random.res \
+	test_recover.res \
 	test_regex_char_classes.res \
 	test_registers.res \
 	test_rename.res \
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index 83f2c1923..f54e6f2c5 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -21,7 +21,6 @@ source test_jumps.vim
 source test_lispwords.vim
 source test_move.vim
 source test_put.vim
-source test_recover.vim
 source test_reltime.vim
 source test_scroll_opt.vim
 source test_searchpos.vim
diff --git a/src/version.c b/src/version.c
index df8d2f917..4d693c45f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2588,
 /**/
     2587,
 /**/