diff --git a/mysql8.4.spec b/mysql8.4.spec
index f46b77f..4899f80 100644
--- a/mysql8.4.spec
+++ b/mysql8.4.spec
@@ -21,7 +21,7 @@ ExcludeArch: %{ix86}
 # 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 8.4.8
+%global last_tested_version 8.4.9
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
diff --git a/rh-skipped-tests-list-s390.list b/rh-skipped-tests-list-s390.list
index 3c01fef..91d3f1d 100644
--- a/rh-skipped-tests-list-s390.list
+++ b/rh-skipped-tests-list-s390.list
@@ -11,3 +11,16 @@ test_services.test_event_tracking_consumer  : BUG#0
 
 # Fails since MySQL 8.4.4
 perfschema.threads_innodb : BUG#0
+
+# Fails since 8.0.46 / 8.4.9 / 9.7.0 on s390x
+# Bug#39129182 tightened InnoDB row size estimation in get_field_max_size().
+# Combined with zlib-ng DFLTCC compressBound() overhead on s390x,
+# compressed tables with small KEY_BLOCK_SIZE exceed row size limits.
+innodb.zlob_geom                            : BUG#0
+innodb_zip.4k                               : BUG#0
+innodb_zip.8k                               : BUG#0
+innodb_zip.bug52745                         : BUG#0
+innodb_zip.index_large_prefix               : BUG#0
+innodb_zip.index_large_prefix_4k            : BUG#0
+innodb_zip.index_large_prefix_8k            : BUG#0
+innodb_zip.prefix_index_liftedlimit         : BUG#0