diff --git a/mariadb.spec b/mariadb.spec
index cf5fe33..be52194 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -10,7 +10,7 @@
 # The last version on which the full testsuite has been run
 # In case of further rebuilds of that version, don't require full testsuite to be run
 # run only "main" suite
-%global last_tested_version 10.5.23
+%global last_tested_version 10.11.6
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -1181,7 +1181,7 @@ export MTR_BUILD_THREAD=$(( $(date +%s) % 1100 ))
       --skip-test-list=unstable-tests
     %endif
     # Second run for the SPIDER suites that fail with SCA (ssl self signed certificate)
-    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --suite=spider,spider/bg,spider/bugfix,spider/handler \
+    perl ./mysql-test-run.pl $common_testsuite_arguments --skip-ssl --big-test --suite=spider,spider/bg,spider/bugfix \
     %if %{ignore_testsuite_result}
       --max-test-fail=999 || :
     %else
diff --git a/rh-skipped-tests-base.list b/rh-skipped-tests-base.list
index cdbd85b..d53c914 100644
--- a/rh-skipped-tests-base.list
+++ b/rh-skipped-tests-base.list
@@ -56,21 +56,38 @@ main.lock_kill                               :
 # Fails since 10.5.20
 innodb.innodb_bug51920			         :
 binlog_encryption.rpl_cant_read_event_incident :
-rpl.rpl_report_port			             :
-rpl.rpl_reset_slave_fail		         :
-rpl.rpl_xa_survive_disconnect_lsu_off	 :
-rpl.rpl_heartbeat_basic			         :
-rpl.rpl_xa_survive_disconnect		     :
-rpl.rpl_err_ignoredtable		         :
-rpl.rpl_row_img_sequence_full		     :
-rpl.rpl_row_img_sequence_min		     :
-rpl.rpl_row_img_sequence_noblob		     :
-rpl.rpl_xa_empty_transaction		     :
-rpl.rpl_slave_shutdown_mdev20821	     :
+bg.spider_fixes                             :
+bugfix.mdev_29904                          : "[Warning] mariadbd: Can't get hardware address with error 0"
+sys_vars.completion_type_func               :
+rpl.rpl_report_port                         :
+rpl.rpl_reset_slave_fail                    :
+rpl.rpl_xa_survive_disconnect_lsu_off       :
+rpl.rpl_heartbeat_basic                     :
+rpl.rpl_xa_survive_disconnect               :
+rpl.rpl_err_ignoredtable                    :
+rpl.rpl_row_img_sequence_full               :
+rpl.rpl_row_img_sequence_min                :
+rpl.rpl_row_img_sequence_noblob             :
+rpl.rpl_xa_empty_transaction                :
+rpl.rpl_slave_shutdown_mdev20821            :
 
-# Unstable since 10.5.22:
-main.init_connect                        :
+# Fails on 10.11.6
+main.plugin_auth                            :
+main.userstat                               :
+main.information_schema                     :
+main.func_sformat                           :
 
-# Fails exclusively on F37
-plugins.feedback_plugin_load             :
-disks.disks                              :
+binlog_encryption.rpl_gtid_basic            :
+multi_source.info_logs                      :
+perfschema.threads_mysql                    :
+rpl.rpl_cant_read_event_incident            :
+rpl.rpl_change_master_demote                :
+rpl.rpl_domain_id_filter_restart            :
+rpl.rpl_gtid_basic                          :
+rpl.rpl_mdev6020                            :
+rpl.rpl_old_master                          :
+rpl.rpl_perfschema_applier_status_by_coordinator :
+rpl.rpl_rewrite_db_sys_vars                 :
+rpl.rpl_semi_sync_wait_point                :
+rpl.rpl_trigger                             :
+rpl.rpl_upgrade_master_info                 :
diff --git a/rh-skipped-tests-ppc.list b/rh-skipped-tests-ppc.list
index 8ccef55..91285c1 100644
--- a/rh-skipped-tests-ppc.list
+++ b/rh-skipped-tests-ppc.list
@@ -1,2 +1,7 @@
 # Fails since 10.5.20
 innodb.innodb_defrag_concurrent        :
+parts.partition_alter4_innodb          :
+rpl.rpl_parallel_optimistic_xa_lsu_off :
+
+# Fails on 10.11.6
+perfschema.threads_innodb :
diff --git a/rh-skipped-tests-s390.list b/rh-skipped-tests-s390.list
index d1fb283..ca850a2 100644
--- a/rh-skipped-tests-s390.list
+++ b/rh-skipped-tests-s390.list
@@ -1,3 +1,12 @@
-# Fails on 10.5.23
-rpl.parallel_backup                :
-sys_vars.completion_type_func      :
+# Fails since 10.5.2
+perfschema.memory_aggregate_32bit :
+period.overlaps :
+
+# Fails on 10.11.6
+main.func_json_notembedded :
+main.analyze_stmt_slow_query_log :
+
+innodb_gis.rtree_rollback1 :
+mariabackup.encrypted_page_corruption :
+mariabackup.huge_lsn :
+mariabackup.xb_file_key_management :