diff --git a/test_regress/driver.pl b/test_regress/driver.pl
index 7c7e5692d..a59442393 100755
--- a/test_regress/driver.pl
+++ b/test_regress/driver.pl
@@ -1023,6 +1023,10 @@ sub compile {
     $param{threads} = ::calc_threads($Vltmt_threads) if $param{threads} < 0 && $param{vltmt};
     $param{context_threads} = $param{threads} >= 1 ? $param{threads} : 1 if !$param{context_threads};
     $param{make_main} = 0 if ($checkflags =~ / -?-main\b/ || $checkflags =~ / -?-binary\b/);
+    if ($checkflags =~ / -?-build\b/ || $checkflags =~ / -?-binary\b/) {
+        $param{verilator_make_cmake} = 0;
+        $param{verilator_make_gmake} = 0;
+    }
 
     $self->{threads} = $param{threads};
     $self->{context_threads} = $param{context_threads};
diff --git a/test_regress/t/t_cxx_equal_to.pl b/test_regress/t/t_cxx_equal_to.pl
index d0f124208..be05b3b5e 100755
--- a/test_regress/t/t_cxx_equal_to.pl
+++ b/test_regress/t/t_cxx_equal_to.pl
@@ -14,8 +14,6 @@ top_filename("t/t_cxx_equal_to.v");
 
 compile(
     verilator_flags2 => ['--binary --timing --trace'],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     );
 
 execute(
diff --git a/test_regress/t/t_dfg_peephole.pl b/test_regress/t/t_dfg_peephole.pl
index 952898fbb..a58241b50 100755
--- a/test_regress/t/t_dfg_peephole.pl
+++ b/test_regress/t/t_dfg_peephole.pl
@@ -59,8 +59,6 @@ close $wrFile;
 compile(
     verilator_flags2 => ["--stats", "--build", "-fno-dfg", "+incdir+$Self->{obj_dir}",
                          "-Mdir", "$Self->{obj_dir}/obj_ref", "--prefix", "Vref"],
-    verilator_make_gmake => 0,
-    verilator_make_cmake => 0
     );
 
 # Compile optimized - also builds executable
@@ -72,8 +70,6 @@ compile(
                          "-CFLAGS \"-I .. -I ../obj_ref\"",
                          "../obj_ref/Vref__ALL.a",
                          "../../t/$Self->{name}.cpp"],
-    verilator_make_gmake => 0,
-    verilator_make_cmake => 0
     );
 
 # Execute test to check equivalence
diff --git a/test_regress/t/t_flag_binary.pl b/test_regress/t/t_flag_binary.pl
index bf2dc801d..ba2c15de6 100755
--- a/test_regress/t/t_flag_binary.pl
+++ b/test_regress/t/t_flag_binary.pl
@@ -17,8 +17,6 @@ compile(
                         "-Mdir $Self->{obj_dir}",
                         "--debug-check", ],
     verilator_flags2 => ['--binary'],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     );
 
 execute(
diff --git a/test_regress/t/t_flag_binary_parallel.pl b/test_regress/t/t_flag_binary_parallel.pl
index 0305abd74..f97b78cf8 100755
--- a/test_regress/t/t_flag_binary_parallel.pl
+++ b/test_regress/t/t_flag_binary_parallel.pl
@@ -17,8 +17,6 @@ compile(
                         "-Mdir $Self->{obj_dir}",
                         "--debug-check", ],
     verilator_flags2 => ['--binary', '--output-split 1'],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     make_main => 0,
     );
 
diff --git a/test_regress/t/t_flag_build.pl b/test_regress/t/t_flag_build.pl
index c26b6bcb0..985c72304 100755
--- a/test_regress/t/t_flag_build.pl
+++ b/test_regress/t/t_flag_build.pl
@@ -12,8 +12,6 @@ scenarios(simulator => 1);
 top_filename("t/t_flag_make_cmake.v");
 
 compile(  # Don't call cmake nor gmake from driver.pl
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     verilator_flags2 => ['--exe --cc --build -j 2',
                          '../' . $Self->{main_filename},
                          '-MAKEFLAGS -p --trace'],
diff --git a/test_regress/t/t_flag_build_bad2.pl b/test_regress/t/t_flag_build_bad2.pl
index a28ddb9a1..b61a1b234 100755
--- a/test_regress/t/t_flag_build_bad2.pl
+++ b/test_regress/t/t_flag_build_bad2.pl
@@ -12,8 +12,6 @@ scenarios(vlt => 1);
 top_filename("t/t_flag_make_cmake.v");
 
 compile(
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     # Need --no-print-directory so golden file doesn't compare directory names
     verilator_flags2 => ["--build --MAKEFLAGS --no-print-directory"
                          ." --MAKEFLAGS illegal-flag-to-fail-make"],
diff --git a/test_regress/t/t_flag_build_jobs_and_j.pl b/test_regress/t/t_flag_build_jobs_and_j.pl
index 356011fbf..bd8c6da26 100755
--- a/test_regress/t/t_flag_build_jobs_and_j.pl
+++ b/test_regress/t/t_flag_build_jobs_and_j.pl
@@ -12,8 +12,6 @@ scenarios(simulator => 1);
 top_filename("t/t_flag_make_cmake.v");
 
 compile(
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     verilator_flags2 => ['--exe --cc --build -j 10 --build-jobs 2 --stats',
                          '../' . $Self->{main_filename}],
     );
diff --git a/test_regress/t/t_flag_main.pl b/test_regress/t/t_flag_main.pl
index f279e8a2e..2d1040ad8 100755
--- a/test_regress/t/t_flag_main.pl
+++ b/test_regress/t/t_flag_main.pl
@@ -15,8 +15,6 @@ compile(
                         "-Mdir $Self->{obj_dir}",
                         "--debug-check", ],
     verilator_flags2 => ['--exe --build --main'],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     # Check that code --main produces uses only most modern API features
     make_flags => 'CPPFLAGS_ADD=-DVL_NO_LEGACY',
     );
diff --git a/test_regress/t/t_flag_main_sc_bad.pl b/test_regress/t/t_flag_main_sc_bad.pl
index 6d6075e78..75c182412 100755
--- a/test_regress/t/t_flag_main_sc_bad.pl
+++ b/test_regress/t/t_flag_main_sc_bad.pl
@@ -12,8 +12,6 @@ scenarios(vlt => 1);
 
 lint(
     verilator_flags2 => ['--exe --build --main --sc'],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     fails => 1,
     expect_filename => $Self->{golden_filename},
     );
diff --git a/test_regress/t/t_flag_main_top_name.pl b/test_regress/t/t_flag_main_top_name.pl
index 876acdd1c..027e13395 100755
--- a/test_regress/t/t_flag_main_top_name.pl
+++ b/test_regress/t/t_flag_main_top_name.pl
@@ -15,8 +15,6 @@ top_filename("t/t_flag_main_top_name.v");
 compile(
     verilator_flags => ["-Mdir $Self->{obj_dir}", "--exe", "--build", "--main"],
     verilator_flags2 => ["--top-module top", "--main-top-name ALTOP"],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     make_main => 0,
     );
 
diff --git a/test_regress/t/t_flag_main_top_name_empty.pl b/test_regress/t/t_flag_main_top_name_empty.pl
index bd3cc906f..2f4bc41fb 100755
--- a/test_regress/t/t_flag_main_top_name_empty.pl
+++ b/test_regress/t/t_flag_main_top_name_empty.pl
@@ -15,8 +15,6 @@ top_filename("t/t_flag_main_top_name.v");
 compile(
     verilator_flags => ["-Mdir $Self->{obj_dir}", "--exe", "--build", "--main"],
     verilator_flags2 => ["--top-module top", "--main-top-name -", "-DMAIN_TOP_NAME_EMPTY"],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     make_main => 0,
     );
 
diff --git a/test_regress/t/t_flag_only_bad.pl b/test_regress/t/t_flag_only_bad.pl
index b01845221..c3650bf1e 100755
--- a/test_regress/t/t_flag_only_bad.pl
+++ b/test_regress/t/t_flag_only_bad.pl
@@ -12,8 +12,6 @@ scenarios(vlt => 1);
 top_filename("t/t_flag_main.v");
 
 lint(
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     verilator_flags2 => ["--binary -E --dpi-hdr-only --lint-only --xml-only -Wall"],
     fails => 1,
     expect_filename => $Self->{golden_filename},
diff --git a/test_regress/t/t_flag_only_bad2.pl b/test_regress/t/t_flag_only_bad2.pl
index d2f4e5124..54cc461d0 100755
--- a/test_regress/t/t_flag_only_bad2.pl
+++ b/test_regress/t/t_flag_only_bad2.pl
@@ -12,8 +12,6 @@ scenarios(vlt => 1);
 top_filename("t/t_flag_main.v");
 
 lint(
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     verilator_flags2 => ["--build -E -Wno-fatal --dpi-hdr-only --lint-only --xml-only"],
     fails => 1,
     expect_filename => $Self->{golden_filename},
diff --git a/test_regress/t/t_flag_verilate.pl b/test_regress/t/t_flag_verilate.pl
index bf4061315..aa1ec0ef8 100755
--- a/test_regress/t/t_flag_verilate.pl
+++ b/test_regress/t/t_flag_verilate.pl
@@ -43,8 +43,6 @@ if ( ! -e $Self->{obj_dir} . '/Vt_flag_verilate.mk' ) {
 
 # Just build, no Verilation. .tree must not be saved even with --dump-tree option.
 compile(  # Don't call cmake nor gmake from driver.pl. Just build here
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     verilator_flags2 => ['--exe --cc --build --no-verilate',
                          '../' . $Self->{main_filename},
                          '--debugi 1 --dump-tree --dump-tree-addrids'],
diff --git a/test_regress/t/t_stack_check.pl b/test_regress/t/t_stack_check.pl
index 0c61fa4eb..934833563 100755
--- a/test_regress/t/t_stack_check.pl
+++ b/test_regress/t/t_stack_check.pl
@@ -12,8 +12,6 @@ scenarios(vlt => 1);
 
 compile(
     verilator_flags2 => ['--binary --debug-stack-check'],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     );
 
 execute();
diff --git a/test_regress/t/t_timing_long.pl b/test_regress/t/t_timing_long.pl
index 2c5c9595e..9c7fdc503 100755
--- a/test_regress/t/t_timing_long.pl
+++ b/test_regress/t/t_timing_long.pl
@@ -57,8 +57,6 @@ gen($Self->{top_filename});
 if ($Self->have_coroutines) {
     compile(
         verilator_flags2 => ["--exe --build --main --tim" . "ing"],
-        verilator_make_cmake => 0,
-        verilator_make_gmake => 0,
         make_top => 1,
         );
 
@@ -69,8 +67,6 @@ if ($Self->have_coroutines) {
 
 compile(
     verilator_flags2 => ["--exe --build --main --no-timing -Wno-STMTDLY"],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     make_top => 1,
     );
 
diff --git a/test_regress/t/t_trace_binary.pl b/test_regress/t/t_trace_binary.pl
index 321b41ed5..afc204bcb 100755
--- a/test_regress/t/t_trace_binary.pl
+++ b/test_regress/t/t_trace_binary.pl
@@ -15,8 +15,6 @@ compile(
                         "-Mdir $Self->{obj_dir}",
                         "--debug-check", ],
     verilator_flags2 => ['--binary --trace'],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     );
 
 execute(
diff --git a/test_regress/t/t_trace_binary_flag_off.pl b/test_regress/t/t_trace_binary_flag_off.pl
index 4a099bdc7..521677772 100755
--- a/test_regress/t/t_trace_binary_flag_off.pl
+++ b/test_regress/t/t_trace_binary_flag_off.pl
@@ -17,8 +17,6 @@ compile(
                         "-Mdir $Self->{obj_dir}",
                         "--debug-check", ],
     verilator_flags2 => ['--binary'],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     );
 
 execute(
diff --git a/test_regress/t/t_trace_timing1.pl b/test_regress/t/t_trace_timing1.pl
index a0528ef80..4c3233d88 100755
--- a/test_regress/t/t_trace_timing1.pl
+++ b/test_regress/t/t_trace_timing1.pl
@@ -15,8 +15,6 @@ compile(
                         "-Mdir $Self->{obj_dir}",
                         "--debug-check", ],
     verilator_flags2 => ['--binary --trace'],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     make_main => 0,
     );
 
diff --git a/test_regress/t/t_trace_ub_misaligned_address.pl b/test_regress/t/t_trace_ub_misaligned_address.pl
index bc08c02fe..9dab0ca4e 100755
--- a/test_regress/t/t_trace_ub_misaligned_address.pl
+++ b/test_regress/t/t_trace_ub_misaligned_address.pl
@@ -16,8 +16,6 @@ compile(
     verilator_flags2 => ["--binary --trace",
                          "-CFLAGS -fsanitize=address,undefined",
                          "-LDFLAGS -fsanitize=address,undefined"],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
     );
 
 execute(
diff --git a/test_regress/t/t_unroll_delay.pl b/test_regress/t/t_unroll_delay.pl
index 9a4002b2d..a9298001e 100755
--- a/test_regress/t/t_unroll_delay.pl
+++ b/test_regress/t/t_unroll_delay.pl
@@ -12,9 +12,6 @@ scenarios(simulator => 1);
 
 compile(
     verilator_flags2 => ['--binary --timing --trace'],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
-    make_main => 0,
     );
 
 execute(
diff --git a/test_regress/t/t_wait_const.pl b/test_regress/t/t_wait_const.pl
index b2d31c26d..901ee7e8b 100755
--- a/test_regress/t/t_wait_const.pl
+++ b/test_regress/t/t_wait_const.pl
@@ -12,9 +12,6 @@ scenarios(vlt => 1);
 
 compile(
     verilator_flags2 => ["--binary"],
-    verilator_make_cmake => 0,
-    verilator_make_gmake => 0,
-    make_main => 0,
     );
 
 execute(