diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 09c3dff9749..3c5bcfd2647 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -429,9 +429,9 @@ sub initial_setup () {
   if ( $glob_cygwin_perl )
   {
     # Windows programs like 'mysqld' needs Windows paths
-    $glob_mysql_test_dir= `cygpath -m $glob_mysql_test_dir`;
+    $glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`;
     my $shell= $ENV{'SHELL'} || "/bin/bash";
-    $glob_cygwin_shell=   `cygpath -w $shell`; # The Windows path c:\...
+    $glob_cygwin_shell=   `cygpath -w "$shell"`; # The Windows path c:\...
     chomp($glob_mysql_test_dir);
     chomp($glob_cygwin_shell);
   }