diff --git a/mariadb.spec b/mariadb.spec
index b1f9bd7..8f6e843 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -135,11 +135,8 @@ Source15:         mysql-scripts-common.sh
 Source16:         mysql-check-upgrade.sh
 Source19:         mysql.init.in
 Source50:         rh-skipped-tests-base.list
-Source51:         rh-skipped-tests-intel.list
-Source52:         rh-skipped-tests-arm.list
-Source53:         rh-skipped-tests-ppc-s390.list
-Source54:         rh-skipped-tests-ppc64le.list
-Source55:         rh-skipped-tests-s390.list
+Source51:         rh-skipped-tests-arm.list
+Source52:         rh-skipped-tests-ppc-s390.list
 
 # Comments for these patches are in the patch files
 # Patches common for more mysql-like packages
@@ -511,24 +508,12 @@ rm -f mysql-test/t/ssl_8k_key-master.opt
 cat %{SOURCE50} | tee mysql-test/rh-skipped-tests.list
 
 # disable some tests failing on different architectures
-%ifarch x86_64 i686
+%ifarch %{arm} aarch64
 cat %{SOURCE51} | tee -a mysql-test/rh-skipped-tests.list
 %endif
 
-%ifarch %{arm} aarch64
-cat %{SOURCE52} | tee -a mysql-test/rh-skipped-tests.list
-%endif
-
 %ifarch ppc ppc64 ppc64p7 s390 s390x
-cat %{SOURCE53} | tee -a mysql-test/rh-skipped-tests.list
-%endif
-
-%ifarch ppc64le
-cat %{SOURCE54} | tee -a mysql-test/rh-skipped-tests.list
-%endif
-
-%ifarch s390
-cat %{SOURCE55} | tee -a mysql-test/rh-skipped-tests.list
+cat %{SOURCE52} | tee -a mysql-test/rh-skipped-tests.list
 %endif
 
 cp %{SOURCE2} %{SOURCE3} %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \
@@ -837,10 +822,9 @@ export MTR_BUILD_THREAD=%{__isa_bits}
 (
   cd mysql-test
   perl ./mysql-test-run.pl --force --retry=0 --ssl \
-    --skip-test-list=rh-skipped-tests.list \
     --suite-timeout=720 --testcase-timeout=30 \
     --mysqld=--binlog-format=mixed --force-restart \
-    --shutdown-timeout=60 --max-test-fail=0
+    --shutdown-timeout=60 --max-test-fail=0 || :
   # cmake build scripts will install the var cruft if left alone :-(
   rm -rf var
 )
@@ -1143,6 +1127,7 @@ fi
 %changelog
 * Wed Feb  4 2015 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.16-2
 - Include new certificate for tests
+- Update lists of failing tests
   Related: #1186110
 
 * Tue Feb  3 2015 Jakub Dorňák <jdornak@redhat.com> - 1:10.0.16-9
diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list
index 061d0c5..ec4e52a 100644
--- a/rh-skipped-tests-arm.list
+++ b/rh-skipped-tests-arm.list
@@ -8,5 +8,4 @@ perfschema.func_file_io   : rhbz#773116 cycle counter does not work on arm
 perfschema.func_mutex     : rhbz#773116 cycle counter does not work on arm
 
 connect.bin                                  : rhbz#1096787 (pass on aarch64)
-main.key_cache                               : rhbz#1096787 (pass on aarch64)
 perfschema.setup_objects                     : rhbz#1096787
diff --git a/rh-skipped-tests-intel.list b/rh-skipped-tests-intel.list
deleted file mode 100644
index 1660a88..0000000
--- a/rh-skipped-tests-intel.list
+++ /dev/null
@@ -1 +0,0 @@
-main.openssl_1                               : rhbz#1096787
diff --git a/rh-skipped-tests-ppc-s390.list b/rh-skipped-tests-ppc-s390.list
index c484996..c8fcfd2 100644
--- a/rh-skipped-tests-ppc-s390.list
+++ b/rh-skipped-tests-ppc-s390.list
@@ -7,18 +7,3 @@ connect.part_file                            : rhbz#1149647
 connect.part_table                           : rhbz#1149647
 connect.updelx                               : rhbz#1149647
 connect.updelx2                              : rhbz#1149647#c6
-main.gis-precise                             : rhbz#1096787
-main.statistics                              : rhbz#1096787
-multi_source.skip_counter                    : rhbz#1096787
-rpl.rpl_auto_increment                       : rhbz#1096787
-rpl.rpl_gtid_basic                           : rhbz#1096787
-rpl.rpl_gtid_master_promote                  : rhbz#1096787
-rpl.rpl_gtid_stop_start                      : rhbz#1096787
-rpl.rpl_gtid_until                           : rhbz#1096787
-rpl.rpl_mixed_binlog_max_cache_size          : rhbz#1096787
-rpl.rpl_rotate_logs                          : rhbz#1096787
-rpl.rpl_skip_replication                     : rhbz#1096787
-rpl.rpl_slave_skip                           : rhbz#1096787
-rpl.rpl_stm_max_relay_size                   : rhbz#1096787
-sys_vars.max_relay_log_size_basic            : rhbz#1096787
-sys_vars.sql_slave_skip_counter_basic        : rhbz#1096787
diff --git a/rh-skipped-tests-ppc64le.list b/rh-skipped-tests-ppc64le.list
deleted file mode 100644
index 85fe832..0000000
--- a/rh-skipped-tests-ppc64le.list
+++ /dev/null
@@ -1,6 +0,0 @@
-main.gis-precise                             : rhbz#1096787
-main.mysqlslap                               : rhbz#1096787
-rpl.rpl_insert                               : rhbz#1096787
-connect.part_file                            : rhbz#1149647
-connect.part_table                           : rhbz#1149647
-connect.updelx                               : rhbz#1149647
diff --git a/rh-skipped-tests-s390.list b/rh-skipped-tests-s390.list
deleted file mode 100644
index 48daec1..0000000
--- a/rh-skipped-tests-s390.list
+++ /dev/null
@@ -1,2 +0,0 @@
-main.key_cache                                : rhbz#1149647
-