--- a/runtime/indent/testdir/runtest.vim
+++ b/runtime/indent/testdir/runtest.vim
@@ -14,6 +14,19 @@ set modeline
 set debug=throw
 set nomore
 
+" Remember the directory where we started.
+let indentDir = getcwd()
+cd ../../src/testdir
+
+" Needed for ValgrindOrAsan().
+source shared.vim
+exe 'cd ' .. fnameescape(indentDir)
+
+if ValgrindOrAsan()
+  let g:vim_indent = {"searchpair_timeout": 1024}
+  let g:python_indent = {"searchpair_timeout": 1024}
+endif
+
 au! SwapExists * call HandleSwapExists()
 func HandleSwapExists()
   " Ignore finding a swap file for the test input and output, the user might be

--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -247,11 +247,6 @@ func RunTheTest(test)
     let g:timeout_start = localtime()
   endif
 
-  if ValgrindOrAsan()
-    let g:vim_indent = {"searchpair_timeout": 1024}
-    let g:python_indent = {"searchpair_timeout": 1024}
-  endif
-
   " Avoid stopping at the "hit enter" prompt
   set nomore
 

--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    833,
+/**/
     832,
 /**/
     831,