diff --git a/debian/mariadb-server.mariadb.init b/debian/mariadb-server.mariadb.init
index f69538323e8..765640327d1 100644
--- a/debian/mariadb-server.mariadb.init
+++ b/debian/mariadb-server.mariadb.init
@@ -10,7 +10,7 @@
 # Default-Stop:      0 1 6
 # Short-Description: Start and stop the MariaDB database server daemon
 # Description:       Controls the main MariaDB database server daemon "mariadbd"
-#                    and its wrapper script "mysqld_safe".
+#                    and its wrapper script "mariadbd-safe".
 ### END INIT INFO
 #
 set -e
@@ -216,7 +216,7 @@ case "${1:-''}" in
       else
         ERROR_LOG_FILE="$(mktemp).err"
         echo # ensure newline
-        timeout --kill-after=20 10 /usr/bin/mysqld_safe "${@:2}" --log-error="$ERROR_LOG_FILE"
+        timeout --kill-after=20 10 /usr/bin/mariadbd-safe "${@:2}" --log-error="$ERROR_LOG_FILE"
         echo "Running '/etc/init.d/mariadb start' failed with error log:"
         cat "$ERROR_LOG_FILE"
       fi
diff --git a/debian/tests/upstream b/debian/tests/upstream
index a348e1545de..966b83575f2 100644
--- a/debian/tests/upstream
+++ b/debian/tests/upstream
@@ -68,7 +68,7 @@ eatmydata perl -I. ./mysql-test-run.pl \
     --parallel=auto --skip-rpl --suite=main \
     --skip-test-list="$MTR_SKIP_TEST_LIST" \
     --vardir="$WORKDIR/var" --tmpdir="$WORKDIR/tmp" \
-    --xml-report="$AUTOPKGTEST_ARTIFACTS/mysql-test-run-junit.xml" \
+    --xml-report="$AUTOPKGTEST_ARTIFACTS/mariadb-test-run-junit.xml" \
     $MTR_ARGUMENTS_APPEND \
     "$@" 2>&1
 echo "run: OK"