diff --git a/mariadb-notestdb.patch b/mariadb-notestdb.patch
deleted file mode 100644
index 90a0d88..0000000
--- a/mariadb-notestdb.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up mariadb-10.0.16/scripts/mysql_install_db.pl.in.createtestdb mariadb-10.0.16/scripts/mysql_install_db.pl.in
---- mariadb-10.0.16/scripts/mysql_install_db.pl.in.createtestdb	2015-03-03 23:02:33.287620715 +0100
-+++ mariadb-10.0.16/scripts/mysql_install_db.pl.in	2015-03-03 23:02:56.664641960 +0100
-@@ -398,10 +398,10 @@ if ( $opt->{'skip-name-resolve'} and $re
- }
- 
- # ----------------------------------------------------------------------
--# Create database directories mysql & test
-+# Create database directories mysql
- # ----------------------------------------------------------------------
- 
--foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql", "$opt->{ldata}/test" )
-+foreach my $dir ( $opt->{ldata}, "$opt->{ldata}/mysql" )
- {
-   # FIXME not really the same as original "mkdir -p", but ok?
-   mkdir($dir, 0700) unless -d $dir;
diff --git a/mariadb.spec b/mariadb.spec
index 582d485..9812066 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -142,7 +142,7 @@
 # Make long macros shorter
 %global sameevr   %{epoch}:%{version}-%{release}
 %global compatver 10.3
-%global bugfixver 6
+%global bugfixver 7
 
 Name:             mariadb
 Version:          %{compatver}.%{bugfixver}
@@ -187,10 +187,6 @@ Patch7:           %{pkgnamepatch}-scripts.patch
 #   Patch9: pre-configure to comply with guidelines
 Patch9:           %{pkgnamepatch}-ownsetup.patch
 
-# Patches specific for this mysql package
-#   Patch37: don't create a test DB: https://jira.mariadb.org/browse/MDEV-12645
-Patch37:          %{pkgnamepatch}-notestdb.patch
-
 # Patches for galera
 Patch40:          %{pkgnamepatch}-galera.cnf.patch
 
@@ -701,7 +697,6 @@ find . -name "*.jar" -type f -exec rm --verbose -f {} \;
 %patch4 -p1
 %patch7 -p1
 %patch9 -p1
-%patch37 -p1
 %patch40 -p1
 
 # workaround for upstream bug #56342
@@ -1408,6 +1403,7 @@ fi
 %{_datadir}/%{pkg_name}/mysql_test_data_timezone.sql
 %{_datadir}/%{pkg_name}/mysql_to_mariadb.sql
 %{_datadir}/%{pkg_name}/mysql_performance_tables.sql
+%{_datadir}/%{pkg_name}/mysql_test_db.sql
 %if %{with mroonga}
 %{_datadir}/%{pkg_name}/mroonga/install.sql
 %{_datadir}/%{pkg_name}/mroonga/uninstall.sql
diff --git a/mysql-prepare-db-dir.sh b/mysql-prepare-db-dir.sh
index 22d0566..a82479f 100644
--- a/mysql-prepare-db-dir.sh
+++ b/mysql-prepare-db-dir.sh
@@ -97,7 +97,7 @@ if should_initialize "$datadir" ; then
     # https://bugzilla.redhat.com/show_bug.cgi?id=1335849#c19
     INITDB_TIMESTAMP=`LANG=C date -u`
     sleep 1
-    @bindir@/mysql_install_db --rpm --datadir="$datadir" --user="$myuser" >&2
+    @bindir@/mysql_install_db --rpm --datadir="$datadir" --user="$myuser" --skip-test-db >&2
     ret=$?
     if [ $ret -ne 0 ] ; then
         echo "Initialization of @NICE_PROJECT_NAME@ database failed." >&2
diff --git a/sources b/sources
index 5ed519a..b541430 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mariadb-10.3.6.tar.gz) = cf146752be5857e702a3c88f42c7b6be3117bd92ac304eb217f902c1ffe478dc3043d3cf6a9a9305b51babb3bafc2612a8e4f5dfa7731cfa53634014d86438d1
+SHA512 (mariadb-10.3.7.tar.gz) = b1b3ad9ddc45bdfd3d03888ba160f9991b23187341deac402d5dc4b735511e29767a5dc64ca557bea9bf3d3b413b941ef2e1f5fa30be056dfaec4542a43895f1