diff --git a/src/testdir/test_debugger.vim b/src/testdir/test_debugger.vim
index 8faf7ac..4c3d672 100644
--- a/src/testdir/test_debugger.vim
+++ b/src/testdir/test_debugger.vim
@@ -52,16 +52,16 @@
   let buf = RunVimInTerminal('-S Xtest.vim', {})
 
   " Start the Vim debugger
-  call RunDbgCmd(buf, ':debug echo Foo()')
+  call RunDbgCmd(buf, ':debug echo Foo()', ['cmd: echo Foo()'])
 
   " Create a few stack frames by stepping through functions
-  call RunDbgCmd(buf, 'step')
-  call RunDbgCmd(buf, 'step')
-  call RunDbgCmd(buf, 'step')
-  call RunDbgCmd(buf, 'step')
-  call RunDbgCmd(buf, 'step')
-  call RunDbgCmd(buf, 'step')
-  call RunDbgCmd(buf, 'step')
+  call RunDbgCmd(buf, 'step', ['line 1: let var1 = 1'])
+  call RunDbgCmd(buf, 'step', ['line 2: let var2 = Bar(var1) + 9'])
+  call RunDbgCmd(buf, 'step', ['line 1: let var1 = 2 + a:var'])
+  call RunDbgCmd(buf, 'step', ['line 2: let var2 = Bazz(var1) + 4'])
+  call RunDbgCmd(buf, 'step', ['line 1: try'])
+  call RunDbgCmd(buf, 'step', ['line 2: let var1 = 3 + a:var'])
+  call RunDbgCmd(buf, 'step', ['line 3: let var3 = "another var"'])
 
   " check backtrace
   call RunDbgCmd(buf, 'backtrace', [
diff --git a/src/testdir/test_environ.vim b/src/testdir/test_environ.vim
index 094c4ce..76ffe56 100644
--- a/src/testdir/test_environ.vim
+++ b/src/testdir/test_environ.vim
@@ -36,7 +36,7 @@
 
   call setenv('FOO', v:null)
   if has('win32')
-    let result = system('set | grep ^FOO=')
+    let result = system('set | findstr ^FOO=')
   else
     let result = system('env | grep ^FOO=')
   endif
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index cb55e28..95fb62e 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -520,7 +520,11 @@
       catch
 	call assert_report('cannot edit "' . names[i] . '": ' . v:errmsg)
       endtry
-      call assert_equal(ft, &filetype, 'with file name: ' . names[i])
+      if &filetype == '' && &readonly
+	" File exists but not able to edit it (permission denied)
+      else
+	call assert_equal(ft, &filetype, 'with file name: ' . names[i])
+      endif
       bwipe!
     endfor
   endfor
diff --git a/src/testdir/test_source.vim b/src/testdir/test_source.vim
index 5166baf..09baec0 100644
--- a/src/testdir/test_source.vim
+++ b/src/testdir/test_source.vim
@@ -44,4 +44,5 @@
   call assert_equal('hello', getline(1))
   call assert_fails('sandbox source! Xsourcehello', 'E48:')
   bwipe!
+  call delete('Xsourcehello')
 endfunc
diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index b97cdb3..9d6fddd 100644
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -8,6 +8,7 @@
 source screendump.vim
 
 let s:python = PythonProg()
+let $PROMPT_COMMAND=''
 
 " Open a terminal with a shell, assign the job to g:job and return the buffer
 " number.
diff --git a/src/version.c b/src/version.c
index eeaa5ef..a7f77fa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1461,
+/**/
     1460,
 /**/
     1459,