diff --git a/src/testdir/test_profile.vim b/src/testdir/test_profile.vim
index 785cee3..13f5fae 100644
--- a/src/testdir/test_profile.vim
+++ b/src/testdir/test_profile.vim
@@ -600,7 +600,7 @@
   call writefile(lines, 'Xprofile_crash.vim')
   call system(GetVimCommandClean() . ' -es -c "so Xprofile_crash.vim" -c q')
   call assert_equal(0, v:shell_error)
-  call CheckScriptSuccess(lines)
+  call assert_true(readfile('Xprofile_crash.log')->len() > 10)
   call delete('Xprofile_crash.vim')
   call delete('Xprofile_crash.log')
 endfunc
diff --git a/src/testdir/test_quickfix.vim b/src/testdir/test_quickfix.vim
index 6ade326..6f25f1d 100644
--- a/src/testdir/test_quickfix.vim
+++ b/src/testdir/test_quickfix.vim
@@ -5362,4 +5362,14 @@
   call Xqfbuf_update('l')
 endfunc
 
+func Test_vimgrep_noswapfile()
+  set noswapfile
+  call writefile(['one', 'two', 'three'], 'Xgreppie')
+  vimgrep two Xgreppie
+  call assert_equal('two', getline('.'))
+
+  call delete('Xgreppie')
+  set swapfile
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index add4c38..58908cd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2571,
+/**/
     2570,
 /**/
     2569,