Index: vim-8.2.0348/src/testdir/Make_all.mak
===================================================================
--- vim-8.2.0348.orig/src/testdir/Make_all.mak
+++ vim-8.2.0348/src/testdir/Make_all.mak
@@ -54,7 +54,6 @@ NEW_TESTS = \
 	test_autoload \
 	test_backspace_opt \
 	test_backup \
-	test_balloon \
 	test_balloon_gui \
 	test_behave \
 	test_blob \
@@ -185,7 +184,6 @@ NEW_TESTS = \
 	test_netbeans \
 	test_normal \
 	test_number \
-	test_options \
 	test_packadd \
 	test_partial \
 	test_paste \
@@ -301,7 +299,6 @@ NEW_TESTS_RES = \
 	test_autocmd.res \
 	test_autoload.res \
 	test_backspace_opt.res \
-	test_balloon.res \
 	test_balloon_gui.res \
 	test_blob.res \
 	test_blockedit.res \
Index: vim-8.2.0348/src/testdir/Makefile
===================================================================
--- vim-8.2.0348.orig/src/testdir/Makefile
+++ vim-8.2.0348/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
@@ -178,8 +176,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: ../optiondefs.h gen_opt_test.vim
-	$(VIMPROG) -u NONE -S gen_opt_test.vim --noplugin --not-a-term ../optiondefs.h
-
 test_xxd.res:
 	XXD=$(XXDPROG); export XXD; $(RUN_VIMTEST) $(NO_INITS) -S runtest.vim test_xxd.vim