diff --git a/config/rv32gc/coverage_extensions.svh b/config/rv32gc/coverage_extensions.svh
index d33bc91b0..80f73c6f4 100644
--- a/config/rv32gc/coverage_extensions.svh
+++ b/config/rv32gc/coverage_extensions.svh
@@ -5,5 +5,7 @@
 // This file is needed in the config subdirectory for each config supporting coverage.
 // It defines which extensions are enabled for that config.
 
-`define COVER_BASE_RV32I
+`define COVER_RV32I
+`define COVER_RV32M
 `include "coverage/RV32I_coverage.svh"
+`include "coverage/RV32M_coverage.svh"
diff --git a/sim/questa/wally.do b/sim/questa/wally.do
index 46ddbb21c..6f8c81b1b 100644
--- a/sim/questa/wally.do
+++ b/sim/questa/wally.do
@@ -141,15 +141,10 @@ if {[lcheck lst "--fcov"]} {
     set FCvlog "+define+INCLUDE_TRACE2COV \
                 +define+IDV_INCLUDE_TRACE2COV \
                 +define+COVER_BASE_RV32I \
-                +define+COVER_LEVEL_DV_PR_EXT \
                 +incdir+$env(WALLY)/addins/riscvISACOV/source \
 		"
-#                +incdir+$env(WALLY)/addins/cvw-arch-verif/fcov/rv32 \
-
     set FCvopt "+TRACE2COV_ENABLE=1 +IDV_TRACE2COV=1"
-    # Uncomment various cover statements below to control which extensions get functional coverage
-    lappend FCdefineCOVER_EXTS "+define+COVER_RV32I"
-    lappend FCdefineCOVER_EXTS "+define+COVER_RV32M"
+
 }
 
 # if --lockstep or --fcov found set flag and remove from list