diff --git a/test_regress/t/t_bench_synmul.pl b/test_regress/t/t_bench_synmul.pl
index 2b3268c3d..418a9d009 100755
--- a/test_regress/t/t_bench_synmul.pl
+++ b/test_regress/t/t_bench_synmul.pl
@@ -9,13 +9,13 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 top_filename("t/t_math_synmul.v");
 
-my $cycles = $Self->{benchmark}||0;
-$cycles = 100 if $cycles<100;
+$Self->{cycles} = $Self->{benchmark}||0;
+$Self->{cycles} = 100 if $Self->{cycles}<100;
 	      
-$Self->{sim_time} = $cycles*100;
+$Self->{sim_time} = $Self->{cycles}*100;
 
 compile (
-    v_flags2 => ["+define+SIM_CYCLES=${cycles}"],
+    v_flags2 => ["+define+SIM_CYCLES=$Self->{cycles}"],
     );
 
 execute (
diff --git a/test_regress/t/t_preproc.pl b/test_regress/t/t_preproc.pl
index b4d82e92f..2cd376666 100755
--- a/test_regress/t/t_preproc.pl
+++ b/test_regress/t/t_preproc.pl
@@ -7,7 +7,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 # Lesser General Public License Version 3 or the Perl Artistic License
 # Version 2.0.
 
-$golden_out ||= "t/$Self->{name}.out";
+$Self->{golden_out} ||= "t/$Self->{name}.out";
 my $stdout_filename = "$Self->{obj_dir}/$Self->{name}__test.vpp";
 
 if (!$Self->{v3}) {
@@ -19,7 +19,7 @@ if (!$Self->{v3}) {
 	     stdout_filename => $stdout_filename,
 	     );
     ok(preproc_check($Self->{top_filename}, $stdout_filename)
-       && files_identical($stdout_filename, $golden_out));
+       && files_identical($stdout_filename, $Self->{golden_out}));
 }
 
 sub preproc_check {
diff --git a/test_regress/t/t_preproc_dos.pl b/test_regress/t/t_preproc_dos.pl
index 0f09b83cf..04041384c 100755
--- a/test_regress/t/t_preproc_dos.pl
+++ b/test_regress/t/t_preproc_dos.pl
@@ -12,7 +12,7 @@ top_filename("$Self->{obj_dir}/$Self->{name}.v");
 # Rather then having to maintain a new .v and .out, simply add returns
 # to all lines of the existing t_preproc test.
 
-$golden_out ||= "$Self->{obj_dir}/$Self->{name}.out";
+$Self->{golden_out} = "$Self->{obj_dir}/$Self->{name}.out";
 
 {
     my $wholefile = file_contents("$Self->{t_dir}/t_preproc.v");
@@ -22,9 +22,9 @@ $golden_out ||= "$Self->{obj_dir}/$Self->{name}.out";
 {
     my $wholefile = file_contents("$Self->{t_dir}/t_preproc.out");
     $wholefile =~ s!t/t_preproc.v!$Self->{obj_dir}/t_preproc_dos.v!og;  # Fix `line's
-    write_wholefile($golden_out, $wholefile);
+    write_wholefile($Self->{golden_out}, $wholefile);
 }
 
-require 't/t_preproc.pl';
+do 't/t_preproc.pl';
 
 1;