diff --git a/regression/test.pl b/regression/test.pl
index 6d5a22d1994..066fe2a572f 100755
--- a/regression/test.pl
+++ b/regression/test.pl
@@ -19,10 +19,10 @@
 
 sub run($$$$$) {
   my ($name, $input, $cmd, $options, $output) = @_;
-  my $cmdline = "$cmd $options $input >$output 2>&1";
+  my $cmdline = "$cmd $options '$input' >'$output' 2>&1";
 
   print LOG "Running $cmdline\n";
-  system("bash", "-c", "cd $name ; $cmdline");
+  system("bash", "-c", "cd '$name' ; $cmdline");
   my $exit_value = $? >> 8;
   my $signal_num = $? & 127;
   my $dumped_core = $? & 128;
@@ -40,8 +40,8 @@ ($$$$$)
     }
   }
 
-  system "echo EXIT=$exit_value >>$name/$output";
-  system "echo SIGNAL=$signal_num >>$name/$output";
+  system "echo EXIT=$exit_value >>'$name/$output'";
+  system "echo SIGNAL=$signal_num >>'$name/$output'";
 
   return $failed;
 }
@@ -119,7 +119,7 @@ ($$$$$)
           my $r;
           $result =~ s/\\/\\\\/g;
           $result =~ s/([^\\])\$/$1\\r\\\\?\$/;
-          system("bash", "-c", "grep $grep_options \$'$result' \"$name/$output\" >/dev/null");
+          system("bash", "-c", "grep $grep_options \$'$result' '$name/$output' >/dev/null");
           $r = ($included ? $? != 0 : $? == 0);
           if($r) {
             print LOG "$result [FAILED]\n";
@@ -304,4 +304,3 @@ ($)
 close LOG;
 
 exit $failures;
-