diff --git a/regression/test.pl b/regression/test.pl
index 9f70b122501..a30fe0b4215 100755
--- a/regression/test.pl
+++ b/regression/test.pl
@@ -74,6 +74,7 @@ ($$$$$$$$$$)
   foreach my $key (@keys) {
     my $value = $defines->{$key};
     $options =~ s/(\$$key$|\$$key )/$value /g;
+    $options =~ s/\$$key([:;])/$value\1/g; # Variables in --classpath are separated by (semi)colons
   }
   if (scalar @keys) {
     foreach my $word (split(/\s/, $options)) {