diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index c7dd41f..3c6fe1c 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -223,7 +223,7 @@
   call feedkeys('x', 'nt')
 endfunc
 
-" Get $VIMPROG to run Vim executable.
+" Get $VIMPROG to run the Vim executable.
 " The Makefile writes it as the first line in the "vimcmd" file.
 func GetVimProg()
   if !filereadable('vimcmd')
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 629c31a..ea845bd 100644
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -845,6 +845,7 @@
   call writefile([], "Xnetbeans")
   let after =<< trim END
     source shared.vim
+    set cpo&vim
 
     func ReadXnetbeans()
       let l = readfile("Xnetbeans")