Index: vim-8.1.1282/src/testdir/test_alot.vim
===================================================================
--- vim-8.1.1282.orig/src/testdir/test_alot.vim
+++ vim-8.1.1282/src/testdir/test_alot.vim
@@ -37,14 +37,12 @@ source test_join.vim
 source test_jumps.vim
 source test_lambda.vim
 source test_lispwords.vim
-source test_mapping.vim
 source test_match.vim
 source test_menu.vim
 source test_messages.vim
 source test_modeline.vim
 source test_move.vim
 source test_partial.vim
-source test_popup.vim
 source test_put.vim
 source test_recover.vim
 source test_reltime.vim
@@ -63,7 +61,6 @@ source test_tagcase.vim
 source test_tagfunc.vim
 source test_tagjump.vim
 source test_taglist.vim
-source test_timers.vim
 source test_true_false.vim
 source test_unlet.vim
 source test_virtualedit.vim
Index: vim-8.1.1282/src/testdir/Make_all.mak
===================================================================
--- vim-8.1.1282.orig/src/testdir/Make_all.mak
+++ vim-8.1.1282/src/testdir/Make_all.mak
@@ -188,7 +188,6 @@ NEW_TESTS = \
 	test_netbeans \
 	test_normal \
 	test_number \
-	test_options \
 	test_packadd \
 	test_partial \
 	test_paste \
@@ -406,11 +405,8 @@ NEW_TESTS_RES = \
 	test_tcl.res \
 	test_termencoding.res \
 	test_termcodes.res \
-	test_terminal.res \
-	test_terminal_fail.res \
 	test_textformat.res \
 	test_textobjects.res \
-	test_textprop.res \
 	test_undo.res \
 	test_user_func.res \
 	test_usercommands.res \
Index: vim-8.1.1282/src/testdir/Makefile
===================================================================
--- vim-8.1.1282.orig/src/testdir/Makefile
+++ vim-8.1.1282/src/testdir/Makefile
@@ -36,8 +36,6 @@ SCRIPTS = $(SCRIPTS_ALL) \
 # Explicit dependencies.
 test49.out: test49.vim
 
-test_options.res test_alot.res: opt_test.vim
-
 SCRIPTS_BENCH = bench_re_freeze.out
 
 .SUFFIXES: .in .out .res .vim
@@ -166,8 +164,5 @@ test_gui_init.res: test_gui_init.vim
 	$(RUN_VIMTEST) -u gui_preinit.vim -U gui_init.vim $(NO_PLUGINS) -S runtest.vim $<
 	@rm vimcmd
 
-opt_test.vim: ../option.c gen_opt_test.vim
-	$(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../option.c
-
 test_xxd.res:
 	XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim