diff --git a/rubygem-mysql2.spec b/rubygem-mysql2.spec
index 0d9c36a..c3dcf15 100644
--- a/rubygem-mysql2.spec
+++ b/rubygem-mysql2.spec
@@ -1,12 +1,12 @@
 # build with tests?
-%bcond_with tests
+%bcond_without tests
 
 # Generated from mysql2-0.3.11.gem by gem2rpm -*- rpm-spec -*-
 %global gem_name mysql2
 
 Name: rubygem-%{gem_name}
 Version: 0.5.3
-Release: 7.1%{?dist}
+Release: 7%{?dist}
 Summary: A simple, fast Mysql library for Ruby, binding to libmysql
 License: MIT
 URL: https://github.com/brianmario/mysql2
@@ -146,6 +146,16 @@ sed -i '/^  it "should set default program_name in connect_attrs" do$/,/^  end$/
 sed -i '/^  it "should set custom connect_attrs" do$/,/^  end$/ s/^/#/' \
   spec/mysql2/client_spec.rb
 
+# This test was passing when going through `rescue` branch up to MariaDB 10.4.
+# It fails since MariaDB 10.5.2 instroduced Performance Schema.
+# https://github.com/brianmario/mysql2/issues/1152
+sed -i '/stmt_count/a\\    pending "Does not work with MariaDB"' \
+  spec/mysql2/statement_spec.rb
+
+# Since MariaDB 10.5. the return error message contains mangled input.
+# https://github.com/brianmario/mysql2/issues/1152
+sed -i '/expect(bad_err.message).to include/ s/^/#/' spec/mysql2/error_spec.rb
+
 rspec -Ilib:%{buildroot}%{gem_extdir_mri} -f d spec
 popd
 
@@ -170,6 +180,11 @@ kill "$(cat "${MYSQL_TEST_PID_FILE}")"
 
 
 %changelog
+* Thu Feb 11 2021 Vít Ondruch <vondruch@redhat.com> - 0.5.3-7
+- Fix FTBFS due to MariaDB 10.5+ incompatibilies.
+  Resolves: rhbz#1914515
+  Resolves: rhbz#1923277
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild