diff --git a/test_regress/t/t_leak.cpp b/test_regress/t/t_leak.cpp
index 8553bfccd..9f640d00e 100644
--- a/test_regress/t/t_leak.cpp
+++ b/test_regress/t/t_leak.cpp
@@ -11,7 +11,7 @@
 #include <cstdlib>
 #include <cstdio>
 #include <verilated.h>
-#include "Vt_leak.h"
+#include VM_PREFIX_INCLUDE
 
 unsigned int main_time = 0;
 double sc_time_stamp() { return main_time; }
@@ -45,7 +45,7 @@ long long get_memory_usage() {
 }
 
 void make_and_destroy() {
-    Vt_leak* topp = new Vt_leak;
+    VM_PREFIX* topp = new VM_PREFIX;
 
     Verilated::debug(0);
     Verilated::gotFinish(0);
diff --git a/test_regress/t/t_leak.pl b/test_regress/t/t_leak.pl
index 4ab37524e..39a931540 100755
--- a/test_regress/t/t_leak.pl
+++ b/test_regress/t/t_leak.pl
@@ -20,6 +20,7 @@ compile(
     make_top_shell => 0,
     make_main => 0,
     verilator_flags2 => ["--exe $Self->{t_dir}/$Self->{name}.cpp"],
+    make_flags => 'CPPFLAGS_ADD=-DVL_NO_LEGACY',
     );
 
 execute(
diff --git a/test_regress/t/t_leak_legacy.pl b/test_regress/t/t_leak_legacy.pl
new file mode 100755
index 000000000..03166108f
--- /dev/null
+++ b/test_regress/t/t_leak_legacy.pl
@@ -0,0 +1,33 @@
+#!/usr/bin/env perl
+if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); die; }
+# DESCRIPTION: Verilator: Verilog Test driver/expect definition
+#
+# Copyright 2003 by Wilson Snyder. This program is free software; you
+# can redistribute it and/or modify it under the terms of either the GNU
+# Lesser General Public License Version 3 or the Perl Artistic License
+# Version 2.0.
+# SPDX-License-Identifier: LGPL-3.0-only OR Artistic-2.0
+
+if ($Self->{vltmt} && exists $ENV{TRAVIS_DIST} &&
+    $ENV{TRAVIS_DIST} eq "trusty")
+{
+    skip("Multithreaded test does not work under CI w/ Ubuntu Trusty");
+}
+
+scenarios(vlt_all => 1);
+
+top_filename("t/t_leak.v");
+
+compile(
+    make_top_shell => 0,
+    make_main => 0,
+    verilator_flags2 => ["--exe $Self->{t_dir}/t_leak.cpp"],
+    make_flags => 'CPPFLAGS_ADD=-UVL_NO_LEGACY',
+    );
+
+execute(
+    check_finished => 1,
+    );
+
+ok(1);
+1;
diff --git a/test_regress/t/t_savable.v b/test_regress/t/t_savable.v
index c5e010a4e..1fc854566 100644
--- a/test_regress/t/t_savable.v
+++ b/test_regress/t/t_savable.v
@@ -15,7 +15,7 @@ module t (/*AUTOARG*/
    parameter MODEL_WIDTH = 10;
    input [MODEL_WIDTH-1:0] model;
 
-   initial $write("Model width = %d\n", MODEL_WIDTH);
+   initial $write("Model width = %0d\n", MODEL_WIDTH);
 
    sub sub (/*AUTOINST*/
 	    // Inputs
diff --git a/test_regress/t/t_savable_format1_bad.out b/test_regress/t/t_savable_format1_bad.out
index 72f5bde4d..9f68e5cfd 100644
--- a/test_regress/t/t_savable_format1_bad.out
+++ b/test_regress/t/t_savable_format1_bad.out
@@ -1,4 +1,4 @@
-Model width =         40
+Model width = 40
 Restoring model from 'obj_vlt/t_savable_format1_bad/saved.vltsv'
 %Error: obj_vlt/t_savable_format1_bad/saved.vltsv:0: Can't deserialize save-restore file as was made from different model: obj_vlt/t_savable_format1_bad/saved.vltsv
 Aborting...
diff --git a/test_regress/t/t_savable_format2_bad.out b/test_regress/t/t_savable_format2_bad.out
index 69680ca5b..5cf0ec859 100644
--- a/test_regress/t/t_savable_format2_bad.out
+++ b/test_regress/t/t_savable_format2_bad.out
@@ -1,4 +1,4 @@
-Model width =          10
+Model width = 10
 Restoring model from 'obj_vlt/t_savable_format2_bad/saved.vltsv'
 %Error: obj_vlt/t_savable_format2_bad/saved.vltsv:0: Can't deserialize; file has wrong header signature, or file not found: obj_vlt/t_savable_format2_bad/saved.vltsv
 Aborting...
diff --git a/test_regress/t/t_savable_format2_bad.pl b/test_regress/t/t_savable_format2_bad.pl
index 8a6e75248..ee0a4d518 100755
--- a/test_regress/t/t_savable_format2_bad.pl
+++ b/test_regress/t/t_savable_format2_bad.pl
@@ -27,7 +27,7 @@ execute(
 # Break the header
 file_sed("$Self->{obj_dir}/saved.vltsv",
          "$Self->{obj_dir}/saved.vltsv",
-         sub { s/verilatorsave01/verilatorsavBAD/g; });
+         sub { s/verilatorsave/verilatorsavBAD/g; });
 
 execute(
     all_run_flags => ['+save_restore=1'],
diff --git a/test_regress/t/t_savable_format3_bad.out b/test_regress/t/t_savable_format3_bad.out
index 3389dee4b..7999da1d3 100644
--- a/test_regress/t/t_savable_format3_bad.out
+++ b/test_regress/t/t_savable_format3_bad.out
@@ -1,4 +1,4 @@
-Model width =          10
+Model width = 10
 Restoring model from 'obj_vlt/t_savable_format3_bad/saved.vltsv'
 %Error: obj_vlt/t_savable_format3_bad/saved.vltsv:0: Can't deserialize; file has wrong end-of-file signature: obj_vlt/t_savable_format3_bad/saved.vltsv
 Aborting...
diff --git a/test_regress/t/t_savable_open_bad.out b/test_regress/t/t_savable_open_bad.out
index ca2151f02..5079f8e58 100644
--- a/test_regress/t/t_savable_open_bad.out
+++ b/test_regress/t/t_savable_open_bad.out
@@ -1,4 +1,4 @@
-Model width =          10
+Model width = 10
 Restoring model from 'obj_vlt/t_savable_open_bad/saved.vltsv'
 %Error: obj_vlt/t_savable_open_bad/saved.vltsv:0: Can't deserialize; file has wrong header signature, or file not found: obj_vlt/t_savable_open_bad/saved.vltsv
 Aborting...