diff --git a/disable-unreliable-tests-arch.patch b/disable-unreliable-tests-arch.patch
deleted file mode 100644
index 987e158..0000000
--- a/disable-unreliable-tests-arch.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: vim-8.2.4063/src/testdir/Make_all.mak
-===================================================================
---- vim-8.2.4063.orig/src/testdir/Make_all.mak
-+++ vim-8.2.4063/src/testdir/Make_all.mak
-@@ -30,24 +30,18 @@ SCRIPTS_TINY_OUT = \
- 
- # Tests for Vim9 script.
- TEST_VIM9 = \
--	test_vim9_assign \
- 	test_vim9_builtin \
- 	test_vim9_cmd \
- 	test_vim9_disassemble \
--	test_vim9_expr \
- 	test_vim9_fails \
--	test_vim9_func \
- 	test_vim9_import \
- 	test_vim9_script
- 
- TEST_VIM9_RES = \
--	test_vim9_assign.res \
- 	test_vim9_builtin.res \
- 	test_vim9_cmd.res \
- 	test_vim9_disassemble.res \
--	test_vim9_expr.res \
- 	test_vim9_fails.res \
--	test_vim9_func.res \
- 	test_vim9_import.res \
- 	test_vim9_script.res
- 
-@@ -224,7 +218,6 @@ NEW_TESTS = \
- 	test_quickfix \
- 	test_quotestar \
- 	test_random \
--	test_recover \
- 	test_regex_char_classes \
- 	test_regexp_latin \
- 	test_regexp_utf8 \
-@@ -460,7 +453,6 @@ NEW_TESTS_RES = \
- 	test_quickfix.res \
- 	test_quotestar.res \
- 	test_random.res \
--	test_recover.res \
- 	test_regex_char_classes.res \
- 	test_registers.res \
- 	test_rename.res \
diff --git a/ignore-flaky-test-failure.patch b/ignore-flaky-test-failure.patch
new file mode 100644
index 0000000..e1e1f12
--- /dev/null
+++ b/ignore-flaky-test-failure.patch
@@ -0,0 +1,20 @@
+Index: vim-9.0.0313/src/testdir/runtest.vim
+===================================================================
+--- vim-9.0.0313.orig/src/testdir/runtest.vim
++++ vim-9.0.0313/src/testdir/runtest.vim
+@@ -482,8 +482,13 @@ for g:testfunc in sort(s:tests)
+       call extend(total_errors, v:errors)
+ 
+       if g:run_nr >= 5 || prev_error == v:errors[0]
+-        call add(total_errors, 'Flaky test failed too often, giving up')
+-        let v:errors = total_errors
++        if $TEST_IGNORE_FLAKY != ''
++          call add(s:messages, 'Flaky test failed too often, ignoring')
++          let v:errors = []
++        else
++          call add(total_errors, 'Flaky test failed too often, giving up')
++          let v:errors = total_errors
++        endif
+         break
+       endif
+ 
diff --git a/vim.changes b/vim.changes
index 8c7eae7..824a865 100644
--- a/vim.changes
+++ b/vim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 30 11:28:55 UTC 2022 - Andreas Schwab <schwab@suse.de>
+
+- ignore-flaky-test-failure.patch: Ignore failure of flaky tests
+- disable-unreliable-tests-arch.patch: Removed
+
 -------------------------------------------------------------------
 Mon Aug 29 12:29:14 UTC 2022 - Ondřej Súkup <mimi.vx@gmail.com>
 
diff --git a/vim.spec b/vim.spec
index a3bdfa5..8f13f25 100644
--- a/vim.spec
+++ b/vim.spec
@@ -73,7 +73,7 @@ Patch21:        %{name}-7.3-filetype_changes.patch
 Patch22:        %{name}-7.4-filetype_mine.patch
 Patch23:        vim-8.0-ttytype-test.patch
 Patch24:        disable-unreliable-tests.patch
-Patch25:        disable-unreliable-tests-arch.patch
+Patch25:        ignore-flaky-test-failure.patch
 Patch100:       vim73-no-static-libpython.patch
 Patch101:       vim-8.0.1568-defaults.patch
 # https://github.com/vim/vim/issues/3348 - problem more probadly in buildenv than in test
@@ -213,9 +213,7 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%ifarch s390x %{arm} aarch64 riscv64
 %patch25 -p1
-%endif
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -480,12 +478,7 @@ sed -i "s@%{_bindir}/env perl@%{_bindir}/perl@" %{buildroot}%{_datadir}/vim/%{VI
 export TERM=xterm
 # Reset the terminal scrolling region left behind by the testsuite
 trap "printf '\e[r'" EXIT
-# Look for "TEST FAILURE" in the build log
-%ifarch ppc ppc64 ppc64le
-LC_ALL=en_US.UTF-8 make -j1 test || { echo "Ignore transient errors for PowerPC. boo#1072651"; }
-%else
-LC_ALL=en_US.UTF-8 make -j1 test
-%endif
+TEST_IGNORE_FLAKY=1 LC_ALL=en_US.UTF-8 make -j1 test
 
 %if %{with libalternatives}
 # with libalternatives