diff --git a/bin/regression-wally b/bin/regression-wally
index 148ad777e..ada56c352 100755
--- a/bin/regression-wally
+++ b/bin/regression-wally
@@ -438,14 +438,14 @@ if (args.buildroot):
     addTests(tests_buildrootbootlockstep, lockstepsim) # lockstep with Questa and ImperasDV runs overnight
 
 if (args.ccov):  # only run RV64GC tests on Questa in code coverage mode
-    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/rv64/", "rv64gc", coveragesim)
-    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/priv/rv64/", "rv64gc", coveragesim)
+    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/lockstep/rv64/", "rv64gc", coveragesim)
+    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/lockstep/priv/rv64/", "rv64gc", coveragesim)
     addTestsByDir(WALLY+"/tests/coverage/", "rv64gc", coveragesim)
 elif (args.fcov):  # run tests in lockstep in functional coverage mode
-    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/rv32/", "rv32gc", coveragesim)
-    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/rv64/", "rv64gc", coveragesim)
-    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/priv/rv32/", "rv32gc", coveragesim)
-    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/priv/rv64/", "rv64gc", coveragesim)
+    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/lockstep/rv32/", "rv32gc", coveragesim)
+    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/lockstep/rv64/", "rv64gc", coveragesim)
+    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/lockstep/priv/rv32/", "rv32gc", coveragesim)
+    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/lockstep/priv/rv64/", "rv64gc", coveragesim)
 elif (args.breker):
     addTestsByDir(WALLY+"/tests/breker/work", "breker", "questa", brekerMode=1)
 else: 
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index aa4e071fb..fd8f11b04 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -60,4 +60,3 @@
 // `include "RV64VM_PMP_coverage.svh"
 // `include "RV64CBO_VM_coverage.svh"
 // `include "RV64CBO_PMP_coverage.svh"
-// `include "RV64Zicbom_coverage.svh"
diff --git a/sim/Makefile b/sim/Makefile
index 5feb25ae4..d4a94112e 100644
--- a/sim/Makefile
+++ b/sim/Makefile
@@ -55,9 +55,9 @@ collect_functcov: remove_functcov_artifacts riscvdv_functcov combine_functcov
 
 riscvdv_functcov:
 	mkdir -p ${SIM}/questa/fcov_logs
-	mkdir -p ${SIM}/questa/fcov_ucdbs
+	mkdir -p ${SIM}/questa/fcov_ucdb
 	rm -rf ${SIM}/questa/fcov_logs/*
-	rm -rf ${SIM}/questa/fcov_ucdbs/*
+	rm -rf ${SIM}/questa/fcov_ucdb/*
 	$(MAKE) riscvdv test_name=riscv_arithmetic_basic_test				    >> ${SIM}/questa/fcov.log 2>&1
 	$(MAKE) riscvdv test_name=riscv_amo_test						          	>> ${SIM}/questa/fcov.log 2>&1
 	$(MAKE) riscvdv test_name=riscv_ebreak_debug_mode_test			    >> ${SIM}/questa/fcov.log 2>&1
@@ -109,7 +109,7 @@ combine_functcov:
 	grep "Total Coverage By Instance" ${SIM}/questa/fcov/fcov.log
 
 remove_functcov_artifacts:
-	rm -rf ${SIM}/questa/riscv.ucdb ${SIM}/questa/fcov.log ${SIM}/questa/covhtmlreport/ ${SIM}/questa/fcov_logs/ ${SIM}/questa/fcov_ucdbs/ ${SIM}/questa/fcov/
+	rm -rf ${SIM}/questa/riscv.ucdb ${SIM}/questa/fcov.log ${SIM}/questa/covhtmlreport/ ${SIM}/questa/fcov_logs/ ${SIM}/questa/fcov_ucdb/ ${SIM}/questa/fcov/
 
 benchmarks:
 	$(MAKE) -C ${WALLY}benchmarks/embench build