diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index bba1b60..22e235d 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -1,7 +1,7 @@
 
 Summary:       Official JDBC driver for MySQL
 Name:          mysql-connector-java
-Version:       8.0.23
+Version:       8.0.25
 Release:       2%{?dist}
 Epoch:         1
 License:       GPLv2 with exceptions
@@ -100,6 +100,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-1.8.0-openjdk \
 %license LICENSE
 
 %changelog
+* Mon May 10 2021 Ondrej Dubaj <odubaj@redhat.com> - 1:8.0.25-1
+- rebase to version 8.0.25
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:8.0.23-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/remove-coverage-test.patch b/remove-coverage-test.patch
index 140157d..db5609e 100644
--- a/remove-coverage-test.patch
+++ b/remove-coverage-test.patch
@@ -1,17 +1,17 @@
-From b31d3c13c6eb99aa75739cd80cb9c43972320e0f Mon Sep 17 00:00:00 2001
+From 398f1c3885c565ae080cb40046728612b583d90d Mon Sep 17 00:00:00 2001
 From: Ondrej Dubaj <odubaj@redhat.com>
-Date: Wed, 26 Aug 2020 08:08:39 +0200
+Date: Tue, 11 May 2021 09:45:27 +0200
 Subject: [PATCH] Remove coverage test
 
 ---
- build.xml | 140 ------------------------------------------------------
- 1 file changed, 140 deletions(-)
+ build.xml | 154 ------------------------------------------------------
+ 1 file changed, 154 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index 98f00ed..fde7906 100644
+index d1b1ab9..9c8ab7d 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -1290,72 +1290,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
+@@ -1266,70 +1266,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
          </condition>
          <echo>${com.mysql.cj.testsuite.message.test.mode}</echo>
  
@@ -20,11 +20,6 @@ index 98f00ed..fde7906 100644
 -            <isset property="com.mysql.cj.coverage.result.dir.final" />
 -        </condition>
 -
--        <local name="com.mysql.cj.testsuite.test.coverage.jvmarg" />
--        <jacoco:agent destfile="${com.mysql.cj.coverage.result.dir.final}/${com.mysql.cj.coverage.result.name.final}"
--                      enabled="${com.mysql.cj.testsuite.test.coverage}"
--                      property="com.mysql.cj.testsuite.test.coverage.jvmarg" />
--
 -        <local name="com.mysql.cj.testsuite.test.coverage.jvmargfinal" />
 -        <condition property="com.mysql.cj.testsuite.test.coverage.jvmargfinal"
 -                   value="${com.mysql.cj.testsuite.test.coverage.jvmarg}"
@@ -49,6 +44,7 @@ index 98f00ed..fde7906 100644
 -                    <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
 -                    <syspropertyset refid="junit.system.properties" />
 -                </fork>
+-                <listener classname="testsuite.JUnitSummary" />
 -                <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
 -                <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
 -            </test>
@@ -62,6 +58,7 @@ index 98f00ed..fde7906 100644
 -                    <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
 -                    <syspropertyset refid="junit.system.properties" />
 -                </fork>
+-                <listener classname="testsuite.JUnitSummary" />
 -                <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
 -                <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
 -            </test>
@@ -76,6 +73,7 @@ index 98f00ed..fde7906 100644
 -                    <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
 -                    <syspropertyset refid="junit.system.properties" />
 -                </fork>
+-                <listener classname="testsuite.JUnitSummary" />
 -                <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
 -                <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
 -            </testclasses>
@@ -84,7 +82,7 @@ index 98f00ed..fde7906 100644
          <junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
              <fileset dir="${com.mysql.cj.testsuite.junit.results}">
                  <include name="**/TEST-*.xml" />
-@@ -1374,80 +1308,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
+@@ -1348,96 +1284,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
      </target>
  
  
@@ -93,10 +91,12 @@ index 98f00ed..fde7906 100644
 -    <!-- ********************************* -->
 -
 -
--    <target name="test-coverage" description="Runs tests collecting coverage results." depends="-set-test-coverage-detaults, test" />
+-    <target name="test-coverage"
+-            description="Runs tests collecting coverage results."
+-            depends="-setup-test-coverage-agent, test" />
 -
 -
--    <target name="-set-test-coverage-detaults">
+-    <target name="-set-test-coverage-defaults" depends="-extra-libs-check">
 -        <condition property="com.mysql.cj.coverage.result.dir.final"
 -                   value="${com.mysql.cj.coverage.result.dir}"
 -                   else="${com.mysql.cj.testsuite.build.dir}/coverage">
@@ -105,6 +105,20 @@ index 98f00ed..fde7906 100644
 -        <condition property="com.mysql.cj.coverage.result.name.final" value="${com.mysql.cj.coverage.result.name}" else="jacoco.exec">
 -            <isset property="com.mysql.cj.coverage.result.name" />
 -        </condition>
+-
+-        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
+-            <classpath>
+-                <fileset dir="${com.mysql.cj.extra.libs}">
+-                    <include name="**/jacocoant.jar" />
+-                </fileset>
+-            </classpath>
+-        </taskdef>
+-    </target>
+-
+-
+-    <target name="-setup-test-coverage-agent" depends="-set-test-coverage-defaults">
+-        <jacoco:agent destfile="${com.mysql.cj.coverage.result.dir.final}/${com.mysql.cj.coverage.result.name.final}"
+-                      property="com.mysql.cj.testsuite.test.coverage.jvmarg" />
 -    </target>
 -
 -
@@ -114,7 +128,7 @@ index 98f00ed..fde7906 100644
 -
 -
 -    <target name="report-coverage"
--            depends="-extra-libs-check, -set-report-coverage-detaults, -jacoco-merge"
+-            depends="-set-report-coverage-defaults, -jacoco-merge"
 -            description="Merges coverage results and creates HTML coverage report.">
 -        <jacoco:report>
 -            <executiondata>
@@ -141,14 +155,14 @@ index 98f00ed..fde7906 100644
 -    </target>
 -
 -
--    <target name="-jacoco-merge" depends="-set-report-coverage-detaults" if="com.mysql.cj.coverage.merge.files">
+-    <target name="-jacoco-merge" depends="-set-report-coverage-defaults" if="com.mysql.cj.coverage.merge.files">
 -        <jacoco:merge destfile="${com.mysql.cj.coverage.merge.result.final}">
 -            <fileset dir="${com.mysql.cj.coverage.result.dir.final}" includes="${com.mysql.cj.coverage.merge.files}" />
 -        </jacoco:merge>
 -    </target>
 -
 -
--    <target name="-set-report-coverage-detaults" depends="-set-test-coverage-detaults">
+-    <target name="-set-report-coverage-defaults" depends="-set-test-coverage-defaults">
 -        <condition property="com.mysql.cj.coverage.merge.result.final"
 -                   value="${com.mysql.cj.coverage.merge.result}"
 -                   else="${com.mysql.cj.coverage.result.dir.final}/jacoco.exec">
@@ -166,5 +180,5 @@ index 98f00ed..fde7906 100644
      <!-- ***** RPM/DEB PACKAGING ***** -->
      <!-- ***************************** -->
 -- 
-2.26.0
+2.30.2