diff --git a/test_regress/t/t_leak.cpp b/test_regress/t/t_leak.cpp
index aabafbfe0..8f0fd3598 100644
--- a/test_regress/t/t_leak.cpp
+++ b/test_regress/t/t_leak.cpp
@@ -15,12 +15,6 @@ double sc_time_stamp () {
     return main_time;
 }
 
-void vl_finish (const char* filename, int linenum, const char* hier) {
-    // Define it to not print a message
-    if (0 && filename && linenum && hier) {}
-    Verilated::gotFinish(true);
-}
-
 long long get_memory_usage() {
     // Return memory usage.  Return 0 if the system doesn't look quite right.
 
diff --git a/test_regress/t/t_leak.pl b/test_regress/t/t_leak.pl
index ff37df609..401bfcafa 100755
--- a/test_regress/t/t_leak.pl
+++ b/test_regress/t/t_leak.pl
@@ -10,7 +10,6 @@ if (!$::Driver) { use FindBin; exec("./driver.pl", @ARGV, $0); die; }
 compile (
 	 make_top_shell => 0,
 	 make_main => 0,
-	 make_flags => "OPT_FAST=-DVL_USER_FINISH",
 	 v_flags2 => ["--exe t/$Last_Self->{name}.cpp"],
 	 ) if $Last_Self->{v3};
 
diff --git a/test_regress/t/t_leak.v b/test_regress/t/t_leak.v
index 9a73eab0c..631c154ad 100644
--- a/test_regress/t/t_leak.v
+++ b/test_regress/t/t_leak.v
@@ -14,7 +14,8 @@ module t (clk);
    always @ (posedge clk) begin
       cyc <= cyc + 1;
       if (cyc==2) begin
-	 $finish;
+	 // Not $finish; as we don't want a message to scroll by
+	 $c("Verilated::gotFinish(true);");
       end
    end
 endmodule