diff --git a/disable-unreliable-tests-arch.patch b/disable-unreliable-tests-arch.patch
new file mode 100644
index 0000000..b4c4a29
--- /dev/null
+++ b/disable-unreliable-tests-arch.patch
@@ -0,0 +1,42 @@
+Index: vim-8.2.3204/src/testdir/Make_all.mak
+===================================================================
+--- vim-8.2.3204.orig/src/testdir/Make_all.mak
++++ vim-8.2.3204/src/testdir/Make_all.mak
+@@ -30,21 +30,17 @@ 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_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_script.res
+@@ -221,7 +217,6 @@ NEW_TESTS = \
+ 	test_quickfix \
+ 	test_quotestar \
+ 	test_random \
+-	test_recover \
+ 	test_regex_char_classes \
+ 	test_regexp_latin \
+ 	test_regexp_utf8 \
+@@ -457,7 +452,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/vim.changes b/vim.changes
index 4eb9e0d..deb022c 100644
--- a/vim.changes
+++ b/vim.changes
@@ -2,7 +2,8 @@
 Fri Jul 23 15:44:04 UTC 2021 - Ondřej Súkup <mimi.vx@gmail.com>
 
 - Updated to version 8.2.3204, fixes the following problems
-- enable test_recover - disable-unreliable-tests.patch
+- enable test_recover on x86_64/i586/ppc64* - disable-unreliable-tests.patch
+- disable faulty tests on arm and s390x arch - disable-unreliable-tests-arch.patch
   * Xxd always reports an old version string. (Åsmund Ervik)
   * Vim9: using try in catch block causes a hang.
   * Vim9: an error in a catch block is not reported.
diff --git a/vim.spec b/vim.spec
index 70d9aa6..2c88269 100644
--- a/vim.spec
+++ b/vim.spec
@@ -66,6 +66,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
 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
@@ -188,6 +189,9 @@ cp %{SOURCE23} runtime/syntax/apparmor.vim
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%ifarch s390x %{arm} aarch64
+%patch25 -p1
+%endif
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1