diff --git a/tests/p_mysql/mysqld_conn_test.sh b/tests/p_mysql/mysqld_conn_test.sh
index 8836de9..25ce173 100755
--- a/tests/p_mysql/mysqld_conn_test.sh
+++ b/tests/p_mysql/mysqld_conn_test.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 t_Log "Running $0 - mysqld client can talk to mysql server."
-HostName=$(hostname --fqdn)
-MySqlHostName=$(mysql -N -B -u root -e "show variables like 'hostname'" | cut -f 2)
+HostName=$(hostname -s)
+MySqlHostName=$(mysql -N -B -u root -e "show variables like 'hostname'" | cut -f 2 | cut -d . -f 1)
 if [ $HostName = ${MySqlHostName} ]; then
 	ret_val=0
 else