diff --git a/mariadb.spec b/mariadb.spec
index 6c7416d..3cda6b1 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -124,7 +124,7 @@
 
 Name:             mariadb
 Version:          %{compatver}.%{bugfixver}
-Release:          4%{?with_debug:.debug}%{?dist}
+Release:          5%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A community developed branch of MySQL
@@ -1332,11 +1332,14 @@ fi
 %endif
 
 %changelog
+* Wed Nov 30 2016 Michal Schorm <mschorm@redhat.com> - 3:10.1.19-5
+- Testsuite blacklists heavily updated. Current tracker: #1399847
+
 * Wed Nov 16 2016 Michal Schorm <mschorm@redhat.com> - 3:10.1.19-4
 - JdbcMariaDB.jar test removed
 - PCRE version check added
-- Resolves: #1382988
-- Related: #1396945, #1096787
+ Resolves: #1382988
+ Related: #1396945, #1096787
 
 * Wed Nov 16 2016 Michal Schorm <mschorm@redhat.com> - 3:10.1.19-4
 - test suite ENABLED, consensus was made it still should be run every build
diff --git a/rh-skipped-tests-arm.list b/rh-skipped-tests-arm.list
index b5f3368..d7e0b58 100644
--- a/rh-skipped-tests-arm.list
+++ b/rh-skipped-tests-arm.list
@@ -1,8 +1,8 @@
-main.analyze_format_json            : rhbz#1096787
-main.analyze_stmt_orderby           : rhbz#1096787
-main.explain_json_format_partitions : rhbz#1096787
-main.explain_json_innodb            : rhbz#1096787
-main.explain_json                   : rhbz#1096787
-main.partition_exchange             : rhbz#1096787
-main.subselect_cache                : rhbz#1096787
-main.type_year                      : rhbz#1096787
+main.partition_exchange             : #1399847
+main.analyze_stmt_orderby           : #1399847
+main.explain_json_innodb            : #1399847
+main.explain_json_format_partitions : #1399847
+main.analyze_format_json            : #1399847
+main.explain_json                   : #1399847
+main.subselect_cache                : #1399847
+main.type_year                      : #1399847
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index 1d161c2..2992d7e 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -1,12 +1,9 @@
-# These tests fail with MariaDB 10:
-
-main.userstat                                   : rhbz#1096787
-main.multi_update                               : rhbz#1096787
-main.set_statement_notembedded_binlog           : rhbz#1096787
-main.ssl_7937                                   : rhbz#1096787
-main.ssl_crl_clients                            : rhbz#1096787
-main.ssl_cert_verify                            : rhbz#1096787
-perfschema.nesting                              : rhbz#1096787
-perfschema.socket_summary_by_event_name_func    : rhbz#1096787
-perfschema.socket_summary_by_instance_func      : rhbz#1096787
-
+main.userstat                                : #1399847
+main.multi_update                            : #1399847
+main.set_statement_notembedded_binlog        : #1399847
+main.ssl_7937                                : #1399847
+main.ssl_crl_clients                         : #1399847
+main.ssl_cert_verify                         : #1399847
+perfschema.nesting                           : #1399847
+perfschema.socket_summary_by_event_name_func : #1399847
+perfschema.socket_summary_by_instance_func   : #1399847
diff --git a/rh-skipped-tests-ppc-s390.list b/rh-skipped-tests-ppc-s390.list
index 39366b5..e69de29 100644
--- a/rh-skipped-tests-ppc-s390.list
+++ b/rh-skipped-tests-ppc-s390.list
@@ -1,22 +0,0 @@
-connect.alter                                : rhbz#1096787
-connect.bin                                  : rhbz#1096787
-connect.dbf                                  : rhbz#1096787
-connect.index                                : rhbz#1096787
-connect.mrr                                  : rhbz#1149647#c6
-connect.part_file                            : rhbz#1149647
-connect.part_table                           : rhbz#1149647
-connect.updelx                               : rhbz#1149647
-connect.updelx2                              : rhbz#1149647#c6
-connect.json_udf                             : rhbz#1149647#c8
-sys_vars.sysvars_server_notembedded          : rhbz#1149647
-main.partition_exchange                      : rhbz#1149647
-main.analyze_stmt_orderby                    : rhbz#1149647
-main.explain_json_innodb                     : rhbz#1149647
-encryption.encrypt_and_grep                  : rhbz#1149647
-main.explain_json_format_partitions          : rhbz#1149647
-main.analyze_format_json                     : rhbz#1149647
-main.explain_json                            : rhbz#1149647
-main.mdev-504                                : rhbz#1149647
-main.subselect_cache                         : rhbz#1149647
-main.type_year                               : rhbz#1149647
-sys_vars.sysvars_wsrep                       : rhbz#1149647