diff --git a/config/rv32gc/coverage.svh b/config/rv32gc/coverage.svh
index 614cd5c3d..0403b7e4b 100644
--- a/config/rv32gc/coverage.svh
+++ b/config/rv32gc/coverage.svh
@@ -8,6 +8,10 @@
 // Define XLEN, used in covergroups
 `define XLEN32 1
 
+// Define relevant addresses
+`define ACCESS_FAULT_ADDRESS 32'h0000
+`define CLINT_BASE 64'h02000000
+
 // Unprivileged extensions
 `include "RV32I_coverage.svh"
 `include "RV32M_coverage.svh"
@@ -39,4 +43,5 @@
 `include "RV32VM_PMP_coverage.svh"
 `include "EndianU_coverage.svh"
 `include "EndianM_coverage.svh"
-`include "EndianS_coverage.svh"
\ No newline at end of file
+`include "EndianS_coverage.svh"
+`include "ExceptionsM_coverage.svh"
\ No newline at end of file
diff --git a/config/rv64gc/coverage.svh b/config/rv64gc/coverage.svh
index 07561b1de..e7c574020 100644
--- a/config/rv64gc/coverage.svh
+++ b/config/rv64gc/coverage.svh
@@ -8,6 +8,10 @@
 // Define XLEN, used in covergroups
 `define XLEN64 1
 
+// Define relevant addresses
+`define ACCESS_FAULT_ADDRESS 64'h00000000
+`define CLINT_BASE 64'h02000000
+
 // Unprivileged extensions
 `include "RV64I_coverage.svh"
 `include "RV64M_coverage.svh"
@@ -39,6 +43,7 @@
 `include "EndianU_coverage.svh"
 `include "EndianM_coverage.svh"
 `include "EndianS_coverage.svh"
+`include "ExceptionsM_coverage.svh"
 // `include "RV64VM_PMP_coverage.svh"
 // `include "RV64CBO_VM_coverage.svh"
 // `include "RV64CBO_PMP_coverage.svh"