diff --git a/testbench/testbench-imperas.sv b/testbench/testbench-imperas.sv
index c27722f9f..17ecad019 100644
--- a/testbench/testbench-imperas.sv
+++ b/testbench/testbench-imperas.sv
@@ -189,6 +189,9 @@ module testbench;
       end
       if (P.SDC_SUPPORTED) begin
           void'(rvviRefMemorySetVolatile(P.SDC_BASE, (P.SDC_BASE + P.SDC_RANGE)));
+      end      
+      if (P.SPI_SUPPORTED) begin
+          void'(rvviRefMemorySetVolatile(P.SPI_BASE, (P.SPI_BASE + P.SPI_RANGE)));
       end
 
       if(P.XLEN==32) begin
diff --git a/testbench/testbench-linux-imperas.sv b/testbench/testbench-linux-imperas.sv
index 501682fa8..eb4f44cdb 100644
--- a/testbench/testbench-linux-imperas.sv
+++ b/testbench/testbench-linux-imperas.sv
@@ -375,6 +375,9 @@ module testbench;
         if (P.SDC_SUPPORTED) begin
             void'(rvviRefMemorySetVolatile(P.SDC_BASE, (P.SDC_BASE + P.SDC_RANGE)));
         end
+        if (P.SPI_SUPPORTED) begin
+            void'(rvviRefMemorySetVolatile(P.SPI_BASE, (P.SPI_BASE + P.SPI_RANGE)));
+        end
 
         if(P.XLEN==32) begin
             void'(rvviRefCsrSetVolatile(0, 32'hC80));   // CYCLEH
diff --git a/tests/riscof/Makefile b/tests/riscof/Makefile
index 24b499d11..ffefde40c 100644
--- a/tests/riscof/Makefile
+++ b/tests/riscof/Makefile
@@ -8,8 +8,8 @@ wally_workdir = $(work)/wally-riscv-arch-test
 current_dir = $(shell pwd)
 #XLEN    ?= 64
 
-#all: root wally32 wally64
 all: root arch32 wally32 wally32e arch64 wally64
+wally-riscv-arch-test: root wally32 wally64
 
 root:
 	mkdir -p $(work_dir)