diff --git a/runtime/indent/testdir/cleantest.vim b/runtime/indent/testdir/cleantest.vim
index 909cf81..69c0a1d 100644
--- a/runtime/indent/testdir/cleantest.vim
+++ b/runtime/indent/testdir/cleantest.vim
@@ -1,6 +1,11 @@
-" Deletes all the test output files: *.fail and *.out
-for fname in glob('testdir/*.out', 1, 1) + glob('testdir/*.fail', 1, 1)
-  call delete(fname)
-endfor
+" Only do this with the +eval feature
+if 1
+
+  " Deletes all the test output files: *.fail and *.out
+  for fname in glob('testdir/*.out', 1, 1) + glob('testdir/*.fail', 1, 1)
+    call delete(fname)
+  endfor
+
+endif
 
 quit
diff --git a/runtime/indent/testdir/runtest.vim b/runtime/indent/testdir/runtest.vim
index 1cc0d3f..96c3145 100644
--- a/runtime/indent/testdir/runtest.vim
+++ b/runtime/indent/testdir/runtest.vim
@@ -2,6 +2,9 @@
 "
 " Current directory must be runtime/indent.
 
+" Only do this with the +eval feature
+if 1
+
 set nocp
 filetype indent on
 set nowrapscan
@@ -116,4 +119,7 @@
   endif
 endfor
 
+" Matching "if 1" at the start.
+endif
+
 qall!
diff --git a/src/version.c b/src/version.c
index 7e8b34e..0231cc8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    599,
+/**/
     598,
 /**/
     597,