diff --git a/community-mysql.spec b/community-mysql.spec
index cf51fb6..00d26de 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -394,33 +394,59 @@ add_test () {
 
 touch %{skiplist}
 
-add_test innodb.redo_log_archive_04 failed since 8.0.17
-add_test clone.remote_dml_no_binlog failed since 8.0.17
-add_test auth_sec.keyring_file_data_qa sporadic since 8.0.19
-add_test collations.chinese sporadic since 8.0.19
+# Fails on all arches
+add_test main.subquery_sj_mat_bka_nobnl             failing since 8.0.24 on F32+
+add_test main.derived_limit                         failing since 8.0.24 on F32+
+add_test main.explain_tree                          failing since 8.0.24 on F32+
+
+add_test auth_sec.keyring_file_data_qa              failing on F32+
+add_test innodb.alter_kill                          failing on F34+
 
 # Fails when -DENABLED_LOCAL_INFILE=ON
-add_test main.mysql_load_data_local_dir local infile on
+add_test main.mysql_load_data_local_dir             failing on F32+
 
-add_test rpl.rpl_row_jsondiff_basic_pk failed since 8.0.22
-add_test rpl.rpl_row_jsondiff_basic_nokey failed since 8.0.22
-
-# These tests fail on armv7hl; last check 8.0.16
-%ifarch %arm aarch64
-add_test gis.st_latitude
-add_test gis.st_longitude
-# Missing hw counters
-add_test perfschema.func_file_io          missing hw on arm32
-add_test perfschema.func_mutex            missing hw on arm32
-add_test perfschema.global_read_lock      missing hw on arm32
-add_test perfschema.setup_objects         missing hw on arm32
-# Test added in 8.0.19
-add_test clone.remote_error_basic max_allowed_packet is 0
-# Failing in ~90% of times
-add_test innodb.create_tablespace
+# Unstable
+add_test innodb.innodb_force_recovery               unstable since 8.0.24 on F32+
+%ifarch x86_64 i686
+add_test clone.local_dml_auto_tune                  unstable on x86_64 and i686
+add_test perfschema.threads_mysql                   unstable on x86_64 and i686
+add-test rpl_gtid.rpl_multi_source_mtr_includes     unstable on x86_64 and i686
 %endif
 
+# ppc64le
+%ifarch ppc64le
+add_test sys_vars.innodb_buffer_pool_size_basic     fails only on ppc64le on f32+
+%endif
+
+# armv7hl
+%ifarch armv7hl
+add_test gis.st_latitude                            fails on F32+
+add_test gis.st_longitude                           fails on F32+
+
+add_test perfschema.func_file_io                    missing hw on 32-bit arm
+add_test perfschema.global_read_lock                missing hw on 32-bit arm
+add_test perfschema.relaylog                        missing hw on 32-bit arm
+add_test perfschema.setup_objects                   missing hw on 32-bit arm
+
+add_test clone.remote_error_basic                   fails since 8.0.19 on F32+, max_allowed_packet is 0
+
+add_test clone.remote_dml_auto_tune
+
+# Unstable
+add_test clone.local_dml_auto_tune                  unstable on armv7hl
+add_test innodb.innodb_bug-13628249                 unstable on armv7hl
+add_test main.grant_dynamic_flush                   unstable on armv7hl
+add_test innodb.innodb_read_only
+%endif
+
+# s390x
 %ifarch s390x
+# Fails since 8.0.21
+add_test x.resource_groups
+
+# Fails since 8.0.22
+add_test main.subquery_bugs
+
 # Fails since F32 Mass Rebuild
 add_test gis.geometry_class_attri_prop
 add_test gis.geometry_property_function_issimple
@@ -429,43 +455,18 @@ add_test gis.spatial_analysis_functions_buffer
 add_test gis.spatial_analysis_functions_centroid
 add_test gis.spatial_analysis_functions_distance
 add_test gis.spatial_operators_intersection
+add_test gis.spatial_operators_union
+add_test gis.spatial_operators_symdifference
 add_test gis.spatial_op_testingfunc_mix
 add_test gis.spatial_utility_function_distance_sphere
 add_test gis.spatial_utility_function_simplify
-add_test innodb.log_encrypt_kill main.with_recursive
-add_test innodb.mysqldump_max_recordsize
-add_test main.lock_multi_bug38499
+
 add_test main.window_std_var
 add_test main.window_std_var_optimized
 add_test main.with_recursive
 
-# Fails since 8.0.21
-add_test x.resource_groups
-add_test gis.spatial_operators_symdifference
-add_test gis.spatial_operators_union
-
-# Fails since 8.0.22
-add_test main.subquery_bugs
-
-%endif
-
-%ifarch %arm
-# Fails since 8.0.22
-add_test perfschema.relaylog
-
-%endif
-
-# Fails since 2021 new year
-add_test main.cast
-add_test innodb.alter_kill
-# Unstable tests
-add_test innodb.innodb_read_only
-add_test perfschema.processlist_acl
-add_test innodb.innodb_bug-13628249
-
-
-%ifarch ppc64le
-add_test sys_vars.innodb_buffer_pool_size_basic
+# Unstable
+add_test main.grant_dynamic_flush
 %endif
 
 # mysql-test
@@ -675,12 +676,12 @@ cp ../../mysql-test/%{skiplist} .
 export MTR_BUILD_THREAD=%{__isa_bits}
 
 ./mtr %{?with_debug:--debug-server} \
-  --mem --parallel=auto --force --retry=2 \
+  --parallel=auto --force --retry=2 \
   --mysqld=--binlog-format=mixed \
   --suite-timeout=720 --testcase-timeout=30 \
   --report-unstable-tests --clean-vardir \
 %if %{check_testsuite}
-  --max-test-fail=0 || :
+  --max-test-fail=200 || :
 %else
   --skip-test-list=%{skiplist}
 %endif