diff --git a/test_regress/t/t_assert_comp_bad.py b/test_regress/t/t_assert_comp_bad.py
index 33f92081e..f9a882f27 100755
--- a/test_regress/t/t_assert_comp_bad.py
+++ b/test_regress/t/t_assert_comp_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.compile(verilator_flags2=['--assert'],
              nc_flags2=['+assert'],
diff --git a/test_regress/t/t_assigndly_dynamic_notiming_bad.py b/test_regress/t/t_assigndly_dynamic_notiming_bad.py
index d1bad5e3a..9f989c49f 100755
--- a/test_regress/t/t_assigndly_dynamic_notiming_bad.py
+++ b/test_regress/t/t_assigndly_dynamic_notiming_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(verilator_flags2=["--no-timing"], fails=True, expect_filename=test.golden_filename)
 
diff --git a/test_regress/t/t_class_local_nested_bad.py b/test_regress/t/t_class_local_nested_bad.py
index 4ea94519e..1952b53a1 100755
--- a/test_regress/t/t_class_local_nested_bad.py
+++ b/test_regress/t/t_class_local_nested_bad.py
@@ -9,8 +9,8 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
-test.compile(fails=test.vlt_all, expect_filename=test.golden_filename)
+test.lint(fails=test.vlt_all, expect_filename=test.golden_filename)
 
 test.passes()
diff --git a/test_regress/t/t_covergroup_in_class_duplicate_bad.py b/test_regress/t/t_covergroup_in_class_duplicate_bad.py
index dd4c4ea2d..1d5ccb8f4 100755
--- a/test_regress/t/t_covergroup_in_class_duplicate_bad.py
+++ b/test_regress/t/t_covergroup_in_class_duplicate_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(fails=True, expect_filename=test.golden_filename)
 
diff --git a/test_regress/t/t_covergroup_with_function_foo_bad.py b/test_regress/t/t_covergroup_with_function_foo_bad.py
index dd4c4ea2d..1d5ccb8f4 100755
--- a/test_regress/t/t_covergroup_with_function_foo_bad.py
+++ b/test_regress/t/t_covergroup_with_function_foo_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(fails=True, expect_filename=test.golden_filename)
 
diff --git a/test_regress/t/t_covergroup_with_sample_args_too_few_bad.py b/test_regress/t/t_covergroup_with_sample_args_too_few_bad.py
index dd4c4ea2d..1d5ccb8f4 100755
--- a/test_regress/t/t_covergroup_with_sample_args_too_few_bad.py
+++ b/test_regress/t/t_covergroup_with_sample_args_too_few_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(fails=True, expect_filename=test.golden_filename)
 
diff --git a/test_regress/t/t_covergroup_with_sample_args_too_many_bad.py b/test_regress/t/t_covergroup_with_sample_args_too_many_bad.py
index dd4c4ea2d..1d5ccb8f4 100755
--- a/test_regress/t/t_covergroup_with_sample_args_too_many_bad.py
+++ b/test_regress/t/t_covergroup_with_sample_args_too_many_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(fails=True, expect_filename=test.golden_filename)
 
diff --git a/test_regress/t/t_init_array_bad.py b/test_regress/t/t_init_array_bad.py
index dd0d7c389..8a96429a7 100755
--- a/test_regress/t/t_init_array_bad.py
+++ b/test_regress/t/t_init_array_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(fails=True, v_flags2=['-Wno-WIDTHTRUNC'], expect_filename=test.golden_filename)
 
diff --git a/test_regress/t/t_mod_interface_clocking_bad.py b/test_regress/t/t_mod_interface_clocking_bad.py
index 382ad0d44..c7d9b21a5 100755
--- a/test_regress/t/t_mod_interface_clocking_bad.py
+++ b/test_regress/t/t_mod_interface_clocking_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(fails=True, expect_filename=test.golden_filename)
 
diff --git a/test_regress/t/t_sys_plusargs_bad.py b/test_regress/t/t_sys_plusargs_bad.py
index 3cc73805c..1a93d5310 100755
--- a/test_regress/t/t_sys_plusargs_bad.py
+++ b/test_regress/t/t_sys_plusargs_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('simulator_st')
 
 test.compile()
 
diff --git a/test_regress/t/t_sys_readmem_bad_addr.py b/test_regress/t/t_sys_readmem_bad_addr.py
index fea74d8c2..4f406c821 100755
--- a/test_regress/t/t_sys_readmem_bad_addr.py
+++ b/test_regress/t/t_sys_readmem_bad_addr.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('simulator_st')
 
 test.compile()
 
diff --git a/test_regress/t/t_sys_readmem_bad_addr2.py b/test_regress/t/t_sys_readmem_bad_addr2.py
index fea74d8c2..4f406c821 100755
--- a/test_regress/t/t_sys_readmem_bad_addr2.py
+++ b/test_regress/t/t_sys_readmem_bad_addr2.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('simulator_st')
 
 test.compile()
 
diff --git a/test_regress/t/t_sys_readmem_bad_digit.py b/test_regress/t/t_sys_readmem_bad_digit.py
index fea74d8c2..4f406c821 100755
--- a/test_regress/t/t_sys_readmem_bad_digit.py
+++ b/test_regress/t/t_sys_readmem_bad_digit.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('simulator_st')
 
 test.compile()
 
diff --git a/test_regress/t/t_sys_readmem_bad_end.py b/test_regress/t/t_sys_readmem_bad_end.py
index ed8db10e9..82792bbb0 100755
--- a/test_regress/t/t_sys_readmem_bad_end.py
+++ b/test_regress/t/t_sys_readmem_bad_end.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('simulator_st')
 
 test.compile()
 
diff --git a/test_regress/t/t_sys_readmem_bad_notfound.py b/test_regress/t/t_sys_readmem_bad_notfound.py
index ed8db10e9..82792bbb0 100755
--- a/test_regress/t/t_sys_readmem_bad_notfound.py
+++ b/test_regress/t/t_sys_readmem_bad_notfound.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('simulator_st')
 
 test.compile()
 
diff --git a/test_regress/t/t_timing_func_fork_bad.py b/test_regress/t/t_timing_func_fork_bad.py
index 839174d60..1caa0a210 100755
--- a/test_regress/t/t_timing_func_fork_bad.py
+++ b/test_regress/t/t_timing_func_fork_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.compile(fails=True,
              verilator_flags2=["--binary -Wno-UNOPTFLAT"],