diff --git a/python-mysqlclient.changes b/python-mysqlclient.changes
index cd85520..4526408 100644
--- a/python-mysqlclient.changes
+++ b/python-mysqlclient.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun  4 07:18:37 UTC 2020 - pgajdos@suse.com
+
+- do mysql shutdown even if testsuite fails, exit 1 afterwards
+
 -------------------------------------------------------------------
 Thu Mar  5 13:33:30 UTC 2020 - Kristyna Streitova <kstreitova@suse.com>
 
diff --git a/python-mysqlclient.spec b/python-mysqlclient.spec
index 6772015..5a5e7dd 100644
--- a/python-mysqlclient.spec
+++ b/python-mysqlclient.spec
@@ -82,17 +82,17 @@ cconf=abuild-myclient.cnf
 #
 # start the mariadb server
 #
-%mysql_testserver_start -u auth_db_user -p auth_db_pass
+%mysql_testserver_start -u auth_db_user -p auth_db_pass -d test_database
 #
 # creating client mysql config
 #
-%mysql_testserver_cconf -n $cconf
+%mysql_testserver_cconf -n $cconf -d test_database
 #
 # running the test
 #
 rm -r MySQLdb
 export TESTDB="$PWD/$cconf"
-%pytest_arch -k "not (test_LONG or test_TEXT)"
+%pytest_arch -k "not (test_LONG or test_TEXT)" || exit_code=1
 #
 # stopping mariadb
 #