diff --git a/mariadb.spec b/mariadb.spec
index c6dd079cc27a06eb50854a38f57733371896543c..afc6c4ba8b9d2f717d04c2812eea07757519c2fe 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -10,6 +10,7 @@ URL:              http://mariadb.org
 
 Source0:          https://downloads.mariadb.org/interstitial/mariadb-%{version}/source/mariadb-%{version}.tar.gz
 Source1:          mariadb-server-galera.te
+Source13:         remove-test.list
 
 BuildRequires:    selinux-policy-devel, cmake, gcc-c++
 BuildRequires:    systemd, systemd-devel, multilib-rpm-config
@@ -191,6 +192,8 @@ This contains test suitte for the developing of MariaDB.
 %autosetup -n %{name}-%{version} -p1
 find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 
+cat %{SOURCE13} | tee -a mysql-test/unstable-tests
+
 mkdir selinux
 sed 's/mariadb-server-galera/%{name}-server-galera/' %{SOURCE1} > selinux/%{name}-server-galera.te
 
diff --git a/remove-test.list b/remove-test.list
new file mode 100644
index 0000000000000000000000000000000000000000..d339bf024004efc75a0eae95f78861542f821ecf
--- /dev/null
+++ b/remove-test.list
@@ -0,0 +1,61 @@
+# The SSL test are failing correctly. Fro more explanation, see:
+# https://jira.mariadb.org/browse/MDEV-8404?focusedCommentId=84275&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-84275
+main.ssl_7937                                : #1399847
+main.ssl_crl_clients                         : #1399847
+main.ssl_cert_verify                         :
+
+main.ssl_8k_key                              :
+
+# From 10.3.9
+main.openssl_1                               :
+main.openssl_6975                            :
+main.ssl                                     :
+main.ssl_cipher                              :
+
+# 
+perfschema.nesting                           : #1399847
+perfschema.socket_summary_by_instance_func   : #1399847
+perfschema.socket_summary_by_event_name_func :
+
+# ------------------------------
+# Tests that fails because of 'Self Signed Certificate in the Certificate Chain'
+perfschema.cnf_option                        :
+
+rpl.rpl_row_img_blobs                        :
+rpl.rpl_row_img_eng_min                      :
+rpl.rpl_row_img_eng_noblob                   :
+
+sys_vars.slave_parallel_threads_basic        :
+
+# ------------------------------
+# Fails since 10.1.12
+innodb.innodb_defrag_binlog                  :
+
+# on x86_64 after 10.2.12 and 10.2.13 after some unidentified change in Rawhide buildroot
+mroonga/storage.index_multiple_column_range_all_used_less_than                               :
+mroonga/storage.index_multiple_column_range_all_used_less_than_or_equal                      :
+mroonga/storage.index_multiple_column_range_partially_used_have_prefix_less_than             :
+mroonga/storage.index_multiple_column_range_partially_used_have_prefix_less_than_or_equal    :
+mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than               :
+mroonga/storage.index_multiple_column_range_partially_used_no_prefix_less_than_or_equal      :
+mroonga/storage.optimization_order_limit_optimized_datetime_less_than                        :
+mroonga/storage.optimization_order_limit_optimized_datetime_less_than_or_equal               :
+
+# Fails everywhere since 10.2.15
+main.userstat                    :
+
+# Fails on x86_64 since 10.2.15
+rocksdb.bulk_load_errors                     :
+rocksdb.index_merge_rocksdb                  :
+rocksdb.index_merge_rocksdb2                 :
+rocksdb.read_only_tx                         :
+rocksdb_rpl.mdev12179                        :
+rocksdb.shutdown                             :
+rocksdb.2pc_group_commit                     :
+
+# Fails on ppc and arm since 10.2.15
+innodb_gis.rtree_compress2                   :
+parts.partition_alter4_innodb                :
+
+# Fails from 10.3.9
+encryption.innodb-redo-badkey :