diff --git a/upstream-testsuite/runtest.sh b/upstream-testsuite/runtest.sh
index c93e567..badc0bd 100755
--- a/upstream-testsuite/runtest.sh
+++ b/upstream-testsuite/runtest.sh
@@ -40,7 +40,7 @@ rlJournalStart
         rlLog "$(readlink -f $(which $JAVAC))"
         rlLog "$(rpm -qf /usr/lib/java/mariadb-java-client.jar)"
         rlAssertRpm --all
-        rlRun "useradd mockbuild -m"
+        rlRun "useradd testuser -m"
         
         rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
         rlRun "chmod a+rwx $TmpDir" 0 "fixing directory permissions"
@@ -53,7 +53,7 @@ rlJournalStart
         done
         
         rlRun "mariadb-install-db --user=mysql --datadir=/var/lib/mysql"
-        rlRun "su -s /bin/bash mysql -c \"mariadbd --general-log=1 --log_warnings=9 &\""
+        rlRun "su -s /bin/bash mysql -c \"mariadbd-safe --general-log=1 --log_warnings=9 &\""
         # wait until the server is ready
         rlRun "tail -f /var/log/mariadb/mariadb.log | grep -q 'mariadbd: ready for connections.'"
         
@@ -65,9 +65,9 @@ rlJournalStart
 
     rlPhaseStartTest
         # -Djunit.jupiter.extensions.autodetection.enabled=true -- unneeded for now
-        rlRun "su mockbuild -c \"ADDITIONAL_FLAGS='-Djunit.jupiter.extensions.autodetection.enabled=true' \
+        rlRun "su testuser -c \"ADDITIONAL_FLAGS='-Djunit.jupiter.extensions.autodetection.enabled=true' \
          /usr/bin/junit-platform-console execute -cp ${JUNIT_CLASSPATH}\
-         --details=verbose --disable-ansi-colors\
+         --details=verbose --disable-ansi-colors --select-package org.mariadb\
          --exclude-classname 'org.mariadb.jdbc.integration.PooledConnectionTest'\
          --exclude-classname 'org.mariadb.jdbc.integration.ConnectionTest'\
          --exclude-classname 'org.mariadb.jdbc.integration.PoolDataSourceTest'\