diff --git a/test_regress/t/t_array_method_bad.py b/test_regress/t/t_array_method_bad.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_array_method_bad.py
+++ b/test_regress/t/t_array_method_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_class_assign_bad.py b/test_regress/t/t_class_assign_bad.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_class_assign_bad.py
+++ b/test_regress/t/t_class_assign_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_class_assign_cond_bad.py b/test_regress/t/t_class_assign_cond_bad.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_class_assign_cond_bad.py
+++ b/test_regress/t/t_class_assign_cond_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_class_param_circ_bad.py b/test_regress/t/t_class_param_circ_bad.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_class_param_circ_bad.py
+++ b/test_regress/t/t_class_param_circ_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_class_param_enum_bad.py b/test_regress/t/t_class_param_enum_bad.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_class_param_enum_bad.py
+++ b/test_regress/t/t_class_param_enum_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_class_param_nested_bad.py b/test_regress/t/t_class_param_nested_bad.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_class_param_nested_bad.py
+++ b/test_regress/t/t_class_param_nested_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_clocking_notiming.py b/test_regress/t/t_clocking_notiming.py
index 6f71603b5..3e536886c 100755
--- a/test_regress/t/t_clocking_notiming.py
+++ b/test_regress/t/t_clocking_notiming.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('vlt')
 
 test.lint(verilator_flags2=["--no-timing"], fails=True, expect_filename=test.golden_filename)
 
diff --git a/test_regress/t/t_constraint_assoc_arr_bad.py b/test_regress/t/t_constraint_assoc_arr_bad.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_constraint_assoc_arr_bad.py
+++ b/test_regress/t/t_constraint_assoc_arr_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_debug_width.py b/test_regress/t/t_debug_width.py
index 1b7346266..deccc7ea3 100755
--- a/test_regress/t/t_debug_width.py
+++ b/test_regress/t/t_debug_width.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('vlt')
 test.top_filename = "t/t_opt_const.v"
 
 test.lint(verilator_flags2=["--lint-only", "--debug-width"],
diff --git a/test_regress/t/t_disable_fork_notiming.py b/test_regress/t/t_disable_fork_notiming.py
index 01b7497f3..e07104c5c 100755
--- a/test_regress/t/t_disable_fork_notiming.py
+++ b/test_regress/t/t_disable_fork_notiming.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('vlt')
 
 test.lint(expect_filename=test.golden_filename, v_flags2=["--no-timing"], fails=True)
 
diff --git a/test_regress/t/t_force_tri.py b/test_regress/t/t_force_tri.py
index 6038b562c..30c3d4f77 100755
--- a/test_regress/t/t_force_tri.py
+++ b/test_regress/t/t_force_tri.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(fails=test.vlt_all, expect_filename=test.golden_filename)
 
diff --git a/test_regress/t/t_mod_interface_array3.py b/test_regress/t/t_mod_interface_array3.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_mod_interface_array3.py
+++ b/test_regress/t/t_mod_interface_array3.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_no_std_bad.py b/test_regress/t/t_no_std_bad.py
index 1f7e09325..4099b8baf 100755
--- a/test_regress/t/t_no_std_bad.py
+++ b/test_regress/t/t_no_std_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(fails=True,
           verilator_flags2=["--no-std", "--exe --main --timing -Wall"],
diff --git a/test_regress/t/t_no_std_pkg_bad.py b/test_regress/t/t_no_std_pkg_bad.py
index 84dacb568..1334e5b4f 100755
--- a/test_regress/t/t_no_std_pkg_bad.py
+++ b/test_regress/t/t_no_std_pkg_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 test.top_filename = "t/t_no_std_bad.v"
 test.golden_filename = "t/t_no_std_bad.out"
 
diff --git a/test_regress/t/t_package_dup_bad.py b/test_regress/t/t_package_dup_bad.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_package_dup_bad.py
+++ b/test_regress/t/t_package_dup_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_param_typedef.py b/test_regress/t/t_param_typedef.py
index 7dcbd6ae6..cca4c9e73 100755
--- a/test_regress/t/t_param_typedef.py
+++ b/test_regress/t/t_param_typedef.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint()
 
diff --git a/test_regress/t/t_randomize_inline_var_ctl_bad.py b/test_regress/t/t_randomize_inline_var_ctl_bad.py
index 6038b562c..30c3d4f77 100755
--- a/test_regress/t/t_randomize_inline_var_ctl_bad.py
+++ b/test_regress/t/t_randomize_inline_var_ctl_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(fails=test.vlt_all, expect_filename=test.golden_filename)
 
diff --git a/test_regress/t/t_randomize_method_with_bad.py b/test_regress/t/t_randomize_method_with_bad.py
index 24e87157b..31228c9a7 100755
--- a/test_regress/t/t_randomize_method_with_bad.py
+++ b/test_regress/t/t_randomize_method_with_bad.py
@@ -9,8 +9,8 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
-test.compile(fails=True, expect_filename=test.golden_filename)
+test.lint(fails=True, expect_filename=test.golden_filename)
 
 test.passes()
diff --git a/test_regress/t/t_randomize_union_bad.py b/test_regress/t/t_randomize_union_bad.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_randomize_union_bad.py
+++ b/test_regress/t/t_randomize_union_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_stream_bad.py b/test_regress/t/t_stream_bad.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_stream_bad.py
+++ b/test_regress/t/t_stream_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_structu_dataType_assignment_bad.py b/test_regress/t/t_structu_dataType_assignment_bad.py
index a5aa131e7..2d150a9df 100755
--- a/test_regress/t/t_structu_dataType_assignment_bad.py
+++ b/test_regress/t/t_structu_dataType_assignment_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(verilator_flags2=['--structs-packed'], fails=True, expect_filename=test.golden_filename)
 
diff --git a/test_regress/t/t_var_static_assign_decl_bad.py b/test_regress/t/t_var_static_assign_decl_bad.py
index efe8cc01c..31228c9a7 100755
--- a/test_regress/t/t_var_static_assign_decl_bad.py
+++ b/test_regress/t/t_var_static_assign_decl_bad.py
@@ -9,7 +9,7 @@
 
 import vltest_bootstrap
 
-test.scenarios('simulator')
+test.scenarios('linter')
 
 test.lint(fails=True, expect_filename=test.golden_filename)