diff --git a/test_regress/t/t_dist_copyright.py b/test_regress/t/t_dist_copyright.py
index 33f1ea63f..76ef97b24 100755
--- a/test_regress/t/t_dist_copyright.py
+++ b/test_regress/t/t_dist_copyright.py
@@ -42,10 +42,10 @@ EXEMPT_FILES_LIST = """
     test_regress/t/t_flag_f__3.v
     test_regress/t/t_fuzz_eof_bad.v
     test_regress/t/t_incr_void.v
-    test_regress/t/t_uvm_pkg_all.vh
-    test_regress/t/t_uvm_pkg_todo.vh
     test_regress/t/tsub/t_flag_f_tsub.v
     test_regress/t/tsub/t_flag_f_tsub_inc.v
+    test_regress/t/uvm/uvm_pkg_all.svh
+    test_regress/t/uvm/uvm_pkg_todo.svh
     verilator.pc.in
     """
 
diff --git a/test_regress/t/t_uvm_all.py b/test_regress/t/t_uvm_all.py
index 790de6b74..f6b5ecee7 100755
--- a/test_regress/t/t_uvm_all.py
+++ b/test_regress/t/t_uvm_all.py
@@ -13,7 +13,7 @@ test.scenarios('vlt')
 
 test.compile(
     v_flags2=[
-        "--binary --timing",  #
+        "--binary --timing +incdir+t/uvm",  #
         "-Wno-PKGNODECL -Wno-IMPLICITSTATIC -Wno-MISINDENT",
         "-Wno-CASEINCOMPLETE -Wno-CASTCONST -Wno-SYMRSVDWORD -Wno-WIDTHEXPAND -Wno-WIDTHTRUNC",
         "-Wno-REALCVT",  # TODO note mostly related to $realtime - could suppress or fix upstream
diff --git a/test_regress/t/t_uvm_all.v b/test_regress/t/t_uvm_all.v
index 594c95679..8ecaba7ed 100644
--- a/test_regress/t/t_uvm_all.v
+++ b/test_regress/t/t_uvm_all.v
@@ -6,7 +6,7 @@
 
 `define UVM_NO_DPI
 
-`include "t_uvm_pkg_all.vh"
+`include "uvm_pkg_all.svh"
 
 module t(/*AUTOARG*/);
 
diff --git a/test_regress/t/t_uvm_todo.py b/test_regress/t/t_uvm_todo.py
index 91773036f..36429f86a 100755
--- a/test_regress/t/t_uvm_todo.py
+++ b/test_regress/t/t_uvm_todo.py
@@ -12,15 +12,9 @@ import multiprocessing
 
 test.scenarios('vlt')
 
-test.compile(
-    v_flags2=[
-        "--timing",  #
-        "-Wno-PKGNODECL -Wno-IMPLICITSTATIC -Wno-MISINDENT",
-        "-Wno-CASEINCOMPLETE -Wno-CASTCONST -Wno-SYMRSVDWORD -Wno-WIDTHEXPAND -Wno-WIDTHTRUNC",
-        "-Wno-REALCVT"  # TODO note mostly related to $realtime - could suppress or fix upstream
-    ],
-    make_flags=['-k -j ' + str(multiprocessing.cpu_count())],
-    verilator_make_gmake=False)
+test.compile(v_flags2=["--timing", "+incdir+t/uvm", "t/t_uvm_todo.vlt"],
+             make_flags=['-k -j ' + str(multiprocessing.cpu_count())],
+             verilator_make_gmake=False)
 
 #test.execute()
 
diff --git a/test_regress/t/t_uvm_todo.v b/test_regress/t/t_uvm_todo.v
index c702f39f3..e77550344 100644
--- a/test_regress/t/t_uvm_todo.v
+++ b/test_regress/t/t_uvm_todo.v
@@ -6,7 +6,7 @@
 
 `define UVM_NO_DPI
 
-`include "t_uvm_pkg_todo.vh"
+`include "uvm_pkg_todo.svh"
 
 module t(/*AUTOARG*/);
 
diff --git a/test_regress/t/t_uvm_todo.vlt b/test_regress/t/t_uvm_todo.vlt
new file mode 100644
index 000000000..06d6a2395
--- /dev/null
+++ b/test_regress/t/t_uvm_todo.vlt
@@ -0,0 +1,31 @@
+// DESCRIPTION: Verilator: Verilog Test module
+//
+// This file ONLY is placed under the Creative Commons Public Domain, for
+// any use, without warranty, 2024 by Wilson Snyder.
+// SPDX-License-Identifier: CC0-1.0
+
+`verilator_config
+
+// Whole-file waivers
+lint_off -rule WIDTHEXPAND -file "*/uvm_*.svh"
+lint_off -rule WIDTHTRUNC -file "*/uvm_*.svh"
+
+// Context-sensitive waivers
+lint_off -rule CASEINCOMPLETE -file "*/uvm_*.svh" -match "* case ({is_R, is_W})*"
+lint_off -rule CASEINCOMPLETE -file "*/uvm_*.svh" -match "* case(orig_severity)*"
+lint_off -rule CASTCONST -file "*/uvm_*.svh" -match "*class{}uvm_callback*"
+lint_off -rule CASTCONST -file "*/uvm_*.svh" -match "*class{}uvm_component*"
+lint_off -rule CASTCONST -file "*/uvm_*.svh" -match "*class{}uvm_event*"
+lint_off -rule CASTCONST -file "*/uvm_*.svh" -match "*class{}uvm_report_object*"
+lint_off -rule CASTCONST -file "*/uvm_*.svh" -match "*class{}uvm_sequence_item*"
+lint_off -rule MISINDENT -file "*/uvm_*.svh" -match "* foreach (abstractions[i])*"
+lint_off -rule MISINDENT -file "*/uvm_*.svh" -match "* foreach (lock_list[i])*"
+lint_off -rule MISINDENT -file "*/uvm_*.svh" -match "* rw_access.data=*"
+lint_off -rule MISINDENT -file "*/uvm_*.svh" -match "* uvm_cmdline_proc =*"
+lint_off -rule REALCVT -file "*/uvm_*.svh" -match "* m_time *"
+lint_off -rule REALCVT -file "*/uvm_*.svh" -match "*$realtime*"
+lint_off -rule SYMRSVDWORD -file "*/uvm_*.svh" -match "*'delete'*"
+lint_off -rule SYMRSVDWORD -file "*/uvm_*.svh" -match "*'list'*"
+lint_off -rule SYMRSVDWORD -file "*/uvm_*.svh" -match "*'map'*"
+lint_off -rule SYMRSVDWORD -file "*/uvm_*.svh" -match "*'override'*"
+lint_off -rule SYMRSVDWORD -file "*/uvm_*.svh" -match "*'volatile'*"
diff --git a/test_regress/t/t_uvm_pkg_all.vh b/test_regress/t/uvm/uvm_pkg_all.svh
similarity index 100%
rename from test_regress/t/t_uvm_pkg_all.vh
rename to test_regress/t/uvm/uvm_pkg_all.svh
diff --git a/test_regress/t/t_uvm_pkg_todo.vh b/test_regress/t/uvm/uvm_pkg_todo.svh
similarity index 100%
rename from test_regress/t/t_uvm_pkg_todo.vh
rename to test_regress/t/uvm/uvm_pkg_todo.svh