diff --git a/autotest.sh b/autotest.sh
index 5196d5c31d..48b7328349 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -185,17 +185,19 @@ function execute_tests {
 		if [ ! -z "$USEDOCKER" ] ; then
 			echo "Fire up the mariadb docker"
 			DOCKER_CONTAINER_ID=$(docker run \
+				-v $BASEDIR/tests/docker/mariadb:/etc/mysql/conf.d \
 				-e MYSQL_ROOT_PASSWORD=owncloud \
 				-e MYSQL_USER="$DATABASEUSER" \
 				-e MYSQL_PASSWORD=owncloud \
 				-e MYSQL_DATABASE="$DATABASENAME" \
-				-d rullzer/mariadb-owncloud)
+				-d mariadb)
 			DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
 
 			echo "Waiting for MariaDB initialisation ..."
-
-			# grep exits on the first match and then the script continues
-			timeout 30 docker logs -f $DOCKER_CONTAINER_ID 2>&1 | grep -q "mysqld: ready for connections."
+			if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 60; then
+				echo "[ERROR] Waited 60 seconds, no response" >&2
+				exit 1
+			fi
 
 			echo "MariaDB is up."
 
diff --git a/tests/docker/mariadb/oc.cnf b/tests/docker/mariadb/oc.cnf
new file mode 100644
index 0000000000..590284d461
--- /dev/null
+++ b/tests/docker/mariadb/oc.cnf
@@ -0,0 +1,5 @@
+
+[mysqld]
+
+innodb_buffer_pool_size = 512M
+innodb_flush_log_at_trx_commit = 2