diff --git a/community-mysql.spec b/community-mysql.spec
index 7a47060..22785a4 100644
--- a/community-mysql.spec
+++ b/community-mysql.spec
@@ -17,7 +17,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 8.0.24
+%global last_tested_version 8.0.25
 # Set to 1 to force run the testsuite even if it was already tested in current version
 %global force_run_testsuite 0
 
@@ -79,8 +79,8 @@
 %global sameevr   %{?epoch:%{epoch}:}%{version}-%{release}
 
 Name:             community-mysql
-Version:          8.0.24
-Release:          3%{?with_debug:.debug}%{?dist}
+Version:          8.0.25
+Release:          1%{?with_debug:.debug}%{?dist}
 Summary:          MySQL client programs and shared libraries
 URL:              http://www.mysql.com
 
@@ -968,6 +968,9 @@ fi
 %endif
 
 %changelog
+* Tue Jun 01 2021 Michal Schorm <mschorm@redhat.com> - 8.0.25-1
+- Update to MySQL 8.0.25
+
 * Wed May 19 2021 Pete Walter <pwalter@fedoraproject.org> - 8.0.24-3
 - Rebuild for ICU 69
 
diff --git a/rh-skipped-tests-list-base.list b/rh-skipped-tests-list-base.list
index 0fbd9de..77743ba 100644
--- a/rh-skipped-tests-list-base.list
+++ b/rh-skipped-tests-list-base.list
@@ -16,3 +16,8 @@ clone.local_dml_auto_tune                  : BUG#0 unstable on x86_64 and i686
 perfschema.threads_mysql                   : BUG#0 unstable on x86_64 and i686
 rpl_gtid.rpl_multi_source_mtr_includes     : BUG#0 unstable on x86_64 and i686
 
+# Failing on 32-bit arches: armv7hl i686 s390x; since MySQL 8.0.25
+x.connection_unixsocket                    : BUG#0
+x.connection_unixsocket_invalid            : BUG#0
+x.connection_unixsocket_lock               : BUG#0
+innodb.innodb_bug-13628249                 : BUG#0
diff --git a/sources b/sources
index 93fc836..21682c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-boost-8.0.24.tar.gz) = ad8510614251c056f0963f8e51b9ed5e75452ccbf2728254d662fcc3a7ee1bdc177d1d34e958ddc31c7e6b5b3af9377ef2d9cbdc0353676b3026619673447deb
+SHA512 (mysql-boost-8.0.25.tar.gz) = af653ccff66a9d87221b46ad4f7bcc629700549f758998b9a7fb22e4573b9495a28624e031f016f9ad8fe0dfcf481b82f1ffe224aa48c2d45531570026b26081