diff --git a/bin/regression-wally b/bin/regression-wally
index 51827bb76..0383a1807 100755
--- a/bin/regression-wally
+++ b/bin/regression-wally
@@ -433,9 +433,9 @@ 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
-    addTests(tests64gc_nofp, coveragesim)
-    if (args.fp):
-        addTests(tests64gc_fp, coveragesim)
+    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/rv64/", "rv64gc", coveragesim)
+    addTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/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)
diff --git a/sim/Makefile b/sim/Makefile
index d94936381..5feb25ae4 100644
--- a/sim/Makefile
+++ b/sim/Makefile
@@ -29,8 +29,8 @@ deriv:
 
 .PHONY: QuestaCodeCoverage collect_functcov combine_functcov remove_functcov_artifacts riscvdv riscvdv_functcov
 
-QuestaCodeCoverage: questa/ucdb/rv64gc_arch64i.ucdb
-	vcover merge -out questa/ucdb/cov.ucdb questa/ucdb/rv64gc_arch64i.ucdb questa/ucdb/rv64gc*.ucdb -logfile questa/cov/log
+QuestaCodeCoverage:
+	vcover merge -out questa/ucdb/cov.ucdb questa/ucdb/rv64gc*.ucdb -logfile questa/cov/log
 #	vcover merge -out questa/ucdb/cov.ucdb questa/ucdb/rv64gc_arch64i.ucdb questa/ucdb/rv64gc*.ucdb questa/ucdb/buildroot_buildroot.ucdb riscv.ucdb -logfile questa/cov/log
 	vcover report -details questa/ucdb/cov.ucdb > questa/cov/rv64gc_coverage_details.rpt
 	vcover report questa/ucdb/cov.ucdb -details -instance=/core/ebu. > questa/cov/rv64gc_coverage_ebu.rpt