diff --git a/test/old/testdir/gen_opt_test.vim b/test/old/testdir/gen_opt_test.vim
index 89ddf283d2..2cc9b3142a 100644
--- a/test/old/testdir/gen_opt_test.vim
+++ b/test/old/testdir/gen_opt_test.vim
@@ -45,17 +45,7 @@ endwhile
 let skip_setglobal_reasons = #{
       \ iminsert: 'The global value is always overwritten by the local value',
       \ imsearch: 'The global value is always overwritten by the local value',
-      \ conceallevel:	'TODO: fix missing error handling for setglobal',
-      \ foldcolumn:	'TODO: fix missing error handling for setglobal',
-      \ numberwidth:	'TODO: fix missing error handling for setglobal',
-      \ scrolloff:	'TODO: fix missing error handling for setglobal',
-      \ shiftwidth:	'TODO: fix missing error handling for setglobal',
-      \ sidescrolloff:	'TODO: fix missing error handling for setglobal',
       \ signcolumn:	'TODO(nvim): fix missing error handling for setglobal',
-      \ tabstop:	'TODO: fix missing error handling for setglobal',
-      \ termwinkey:	'TODO: fix missing error handling for setglobal',
-      \ termwinsize:	'TODO: fix missing error handling for setglobal',
-      \ textwidth:	'TODO: fix missing error handling for setglobal',
       \ winhighlight:	'TODO(nvim): fix missing error handling for setglobal',
       \}