diff --git a/config/rv32gc/coverage_extensions.svh b/config/rv32gc/coverage_extensions.svh
new file mode 100644
index 000000000..38dff14f4
--- /dev/null
+++ b/config/rv32gc/coverage_extensions.svh
@@ -0,0 +1,10 @@
+// coverage_extensions.svh
+// David_Harris@hmc.edu 7 September 2024
+// SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
+
+// 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
+
+`include "coverage/RV32I_coverage.svh"
\ No newline at end of file
diff --git a/sim/questa/wally.do b/sim/questa/wally.do
index 53ff8d0b8..46ddbb21c 100644
--- a/sim/questa/wally.do
+++ b/sim/questa/wally.do
@@ -150,12 +150,6 @@ if {[lcheck lst "--fcov"]} {
     # Uncomment various cover statements below to control which extensions get functional coverage
     lappend FCdefineCOVER_EXTS "+define+COVER_RV32I"
     lappend FCdefineCOVER_EXTS "+define+COVER_RV32M"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64M"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64A"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64F"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64D"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64ZICSR"
-    #lappend FCdefineCOVER_EXTS "+define+COVER_RV64C"
 }
 
 # if --lockstep or --fcov found set flag and remove from list