diff --git a/randgen/lib/DBServer/MySQL/MySQLd.pm b/randgen/lib/DBServer/MySQL/MySQLd.pm
index 581347a51..ce5c640c0 100644
--- a/randgen/lib/DBServer/MySQL/MySQLd.pm
+++ b/randgen/lib/DBServer/MySQL/MySQLd.pm
@@ -574,7 +574,7 @@ sub stopServer {
         my $waits = 0;
         # Need to check if $dbh is defined, in case the server has crashed
         if (defined $dbh) {
-            $res = $dbh->func('shutdown','127.0.0.1','root','admin');
+            $res = $dbh->do("SHUTDOWN");
             if ($res) {
                 while ($self->running && $waits < 100) {
                     Time::HiRes::sleep(0.2);
diff --git a/randgen/lib/GenTest/Reporter/Shutdown.pm b/randgen/lib/GenTest/Reporter/Shutdown.pm
index 44299ad34..ddd27d54d 100644
--- a/randgen/lib/GenTest/Reporter/Shutdown.pm
+++ b/randgen/lib/GenTest/Reporter/Shutdown.pm
@@ -59,7 +59,7 @@ sub report {
         
         if (defined $dbh) {
             say("Shutting down server on port $port via DBI...");
-            $dbh->func('shutdown', 'admin');
+            $dbh->do("SHUTDOWN");
         }
         
         if (defined $pid) {