diff --git a/test_regress/driver.pl b/test_regress/driver.pl
index 430db8cf9..b9d710477 100755
--- a/test_regress/driver.pl
+++ b/test_regress/driver.pl
@@ -433,7 +433,8 @@ sub new {
     $self->{run_log_filename} ||= "$self->{obj_dir}/vlt_sim.log";
     $self->{coverage_filename} ||= "$self->{obj_dir}/coverage.dat";
     $self->{main_filename} ||= "$self->{obj_dir}/$self->{VM_PREFIX}__main.cpp";
-    ($self->{top_filename} = $self->{pl_filename}) =~ s/\.pl$//;
+    ($self->{top_filename} ||= $self->{pl_filename}) =~ s/\.pl$//;
+    ($self->{golden_filename} ||= $self->{pl_filename}) =~ s/\.pl$/.out/;
     if (-e ($self->{top_filename}.".vhd")) { # If VHDL file exists
 	$self->{vhdl} = 1;
         $self->{top_filename} .= ".vhd";
diff --git a/test_regress/t/t_case_write1.pl b/test_regress/t/t_case_write1.pl
index 50b2ba9d1..caa516e6c 100755
--- a/test_regress/t/t_case_write1.pl
+++ b/test_regress/t/t_case_write1.pl
@@ -9,8 +9,6 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(simulator => 1);
 
-$Self->{golden_out} ||= "t/$Self->{name}.out";
-
 compile(
     verilator_flags2 => ["--stats --O3 -x-assign fast"],
     );
@@ -19,5 +17,5 @@ execute(
     check_finished => 1,
     );
 
-ok(files_identical("$Self->{obj_dir}/$Self->{name}_logger.log", $Self->{golden_out}));
+ok(files_identical("$Self->{obj_dir}/$Self->{name}_logger.log", $Self->{golden_filename}));
 1;
diff --git a/test_regress/t/t_case_write2.pl b/test_regress/t/t_case_write2.pl
index 104eba11b..a504c7931 100755
--- a/test_regress/t/t_case_write2.pl
+++ b/test_regress/t/t_case_write2.pl
@@ -9,8 +9,6 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(simulator => 1);
 
-$Self->{golden_out} ||= "t/$Self->{name}.out";
-
 compile(
     verilator_flags2 => ["--stats --O3 -x-assign fast"],
     );
@@ -19,6 +17,6 @@ execute(
     check_finished => 1,
     );
 
-ok(files_identical("$Self->{obj_dir}/$Self->{name}_logger.log", $Self->{golden_out}));
+ok(files_identical("$Self->{obj_dir}/$Self->{name}_logger.log", $Self->{golden_filename}));
 
 1;
diff --git a/test_regress/t/t_pipe_filter.pl b/test_regress/t/t_pipe_filter.pl
index e33936e57..1c31b5f72 100755
--- a/test_regress/t/t_pipe_filter.pl
+++ b/test_regress/t/t_pipe_filter.pl
@@ -9,7 +9,6 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(vlt => 1);
 
-$Self->{golden_out} ||= "t/$Self->{name}.out";
 my $stdout_filename = "$Self->{obj_dir}/$Self->{name}__test.vpp";
 
 compile(
@@ -17,6 +16,6 @@ compile(
     verilator_make_gcc => 0,
     stdout_filename => $stdout_filename,
     );
-ok(files_identical($stdout_filename, $Self->{golden_out}));
+ok(files_identical($stdout_filename, $Self->{golden_filename}));
 
 1;
diff --git a/test_regress/t/t_preproc.pl b/test_regress/t/t_preproc.pl
index 364edc564..623803b9e 100755
--- a/test_regress/t/t_preproc.pl
+++ b/test_regress/t/t_preproc.pl
@@ -9,7 +9,6 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(vlt => 1);
 
-$Self->{golden_out} ||= "t/$Self->{name}.out";
 my $stdout_filename = "$Self->{obj_dir}/$Self->{name}__test.vpp";
 
 compile(
@@ -19,7 +18,7 @@ compile(
     );
 
 ok(preproc_check($Self->{top_filename}, $stdout_filename)
-   && files_identical($stdout_filename, $Self->{golden_out}));
+   && files_identical($stdout_filename, $Self->{golden_filename}));
 
 sub preproc_check {
     my $filename1 = shift;
diff --git a/test_regress/t/t_preproc_comments.pl b/test_regress/t/t_preproc_comments.pl
index fb687c03c..1d34de483 100755
--- a/test_regress/t/t_preproc_comments.pl
+++ b/test_regress/t/t_preproc_comments.pl
@@ -11,7 +11,6 @@ scenarios(vlt => 1);
 
 top_filename("t/t_preproc.v");
 
-$Self->{golden_out} ||= "t/$Self->{name}.out";
 my $stdout_filename = "$Self->{obj_dir}/$Self->{name}__test.vpp";
 
 compile(
@@ -20,6 +19,6 @@ compile(
     stdout_filename => $stdout_filename,
     );
 
-ok(files_identical($stdout_filename, $Self->{golden_out}));
+ok(files_identical($stdout_filename, $Self->{golden_filename}));
 
 1;
diff --git a/test_regress/t/t_preproc_defines.pl b/test_regress/t/t_preproc_defines.pl
index eb1d00b5e..e79c2d2a1 100755
--- a/test_regress/t/t_preproc_defines.pl
+++ b/test_regress/t/t_preproc_defines.pl
@@ -11,7 +11,6 @@ scenarios(vlt => 1);
 
 top_filename("t/t_preproc.v");
 
-$Self->{golden_out} ||= "t/$Self->{name}.out";
 my $stdout_filename = "$Self->{obj_dir}/$Self->{name}__test.vpp";
 
 compile(
@@ -20,6 +19,6 @@ compile(
     stdout_filename => $stdout_filename,
     );
 
-ok(files_identical($stdout_filename, $Self->{golden_out}));
+ok(files_identical($stdout_filename, $Self->{golden_filename}));
 
 1;
diff --git a/test_regress/t/t_preproc_dos.pl b/test_regress/t/t_preproc_dos.pl
index c43722876..7496f75ef 100755
--- a/test_regress/t/t_preproc_dos.pl
+++ b/test_regress/t/t_preproc_dos.pl
@@ -7,15 +7,14 @@ 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.
 
-scenarios(simulator => 1);
+scenarios(vlt => 1);
 
 top_filename("$Self->{obj_dir}/$Self->{name}.v");
+$Self->{golden_filename} = "$Self->{obj_dir}/$Self->{name}.out";
 
 # Rather then having to maintain a new .v and .out, simply add returns
 # to all lines of the existing t_preproc test.
 
-$Self->{golden_out} = "$Self->{obj_dir}/$Self->{name}.out";
-
 {
     my $wholefile = file_contents("$Self->{t_dir}/t_preproc.v");
     $wholefile =~ s/\n/\r\n/og;
@@ -24,7 +23,7 @@ $Self->{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($Self->{golden_out}, $wholefile);
+    write_wholefile($Self->{golden_filename}, $wholefile);
 }
 
 do 't/t_preproc.pl';