diff --git a/community-mysql.spec b/community-mysql.spec
index 3da0661..f0d9038 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -429,41 +429,24 @@ add_test () {
 
 touch %{skiplist}
 
-# unstable on all archs
-add_test main.xa_prepared_binlog_off          : unstable test
-add_test binlog.binlog_xa_prepared_disconnect : unstable test
-add_test innodb.table_encrypt_kill            : unstable test
-add_test perfschema.memory_aggregate_no_a_no_u_no_h : unstable test
-add_test main.mysqlpump_basic                 :  unstable test
-
-# these tests fail in 5.7.14 on arm32
+# these tests fail on arm32
 %ifarch %arm
-# GIS related issue
-add_test innodb_gis.1     : arm32 gis issue
-add_test innodb_gis.gis   : arm32 gis issue
-add_test main.gis-precise : arm32 gis issue
-add_test main.gis         : arm32 gis issue
-add_test gis.gis_bugs_crashes : arm32 gis issue
-add_test gis.spatial_operators_intersection : arm32 gis issue
-add_test gis.spatial_operators_union : arm32 gis issue
-add_test gis.spatial_testing_functions_contains : arm32 gis issue
-add_test gis.spatial_testing_functions_crosses  : arm32 gis issue
-add_test gis.spatial_testing_functions_equals   : arm32 gis issue
-add_test gis.spatial_testing_functions_touches  : arm32 gis issue
-add_test gis.spatial_testing_functions_within   : arm32 gis issue
 # FTS
-add_test innodb_fts.opt : arm32 FTS issue
+add_test innodb_fts.opt                   : arm32 FTS issue
 # Missing hw counters
-add_test perfschema.func_mutex          : missing hw on arm32
-add_test perfschema.func_file_io        : missing hw on arm32
-add_test perfschema.mdl_func            : missing hw on arm32
-add_test perfschema.setup_objects       : missing hw on arm32
-add_test perfschema.global_read_lock    : missing hw on arm32
+add_test perfschema.func_file_io          : missing hw on arm32
+add_test perfschema.setup_objects         : missing hw on arm32
 %endif
 
-# this test fail in 5.7.14 on ppc64* and aarch64
-%ifarch ppc64 ppc64le aarch64
-add_test innodb.innodb            : missing correct value
+# this test fail on ppc64*
+%ifarch ppc64 ppc64le
+add_test innodb.innodb                    : missing correct value
+add_test perfschema.memory_aggregate_no_a : incorrect numbers in output
+%endif
+
+# test fails on x86_64
+%ifarch x86_64
+add_test main.mysql_upgrade               : Result content mismatch
 %endif
 
 popd