diff --git a/pipelined/regression/Makefile b/pipelined/regression/Makefile
index b34af3208..f15013280 100644
--- a/pipelined/regression/Makefile
+++ b/pipelined/regression/Makefile
@@ -24,9 +24,10 @@ clean:
 
 riscoftests: 
 # 	Builds riscv-arch-test 64 and 32-bit versions and builds wally-riscv-arch-test 64 and 32-bit versions
-	make -C ../../tests/riscof/ XLEN=32
-	make -C ../../tests/riscof/ XLEN=32 build_rv32e
-	make -C ../../tests/riscof/ XLEN=64
+	make -C ../../tests/riscof/ 
+#	make -C ../../tests/riscof/ XLEN=32
+#	make -C ../../tests/riscof/ XLEN=32 build_rv32e
+#	make -C ../../tests/riscof/ XLEN=64
 
 memfiles:
 	make -f makefile-memfile wally-sim-files --jobs
diff --git a/tests/riscof/Makefile b/tests/riscof/Makefile
index a97a0912b..81e36b037 100644
--- a/tests/riscof/Makefile
+++ b/tests/riscof/Makefile
@@ -6,7 +6,7 @@ arch_workdir = $(work)/riscv-arch-test
 wally_workdir = $(work)/wally-riscv-arch-test
 
 current_dir = $(shell pwd)
-XLEN    ?= 64
+#XLEN    ?= 64
 
 #all: root build_rv32e build_wally build_arch 
 all: root fsd_fld_tempfix arch32 wally32  wally32e arch64 wally64
@@ -16,7 +16,9 @@ root:
 	mkdir -p $(work)
 	mkdir -p $(arch_workdir)
 	mkdir -p $(wally_workdir)
-	sed 's,{0},$(current_dir),g;s,{1},$(XLEN)$(if $(findstring 64,$(XLEN)),gc,imc),g' config.ini > config$(XLEN).ini
+	sed 's,{0},$(current_dir),g;s,{1},32imc,g' config.ini > config32.ini
+	sed 's,{0},$(current_dir),g;s,{1},64gc,g' config.ini > config64.ini
+	sed 's,{0},$(current_dir),g;s,{1},32e,g' config.ini > config32e.ini
 
 fsd_fld_tempfix:
     # this is a temporary fix, there's a typo on the rv64i_m/D/src/d_fsd-align-01.S and rv64i_m/D/src/d_fld-align-01.S tests
@@ -43,7 +45,6 @@ wally64:
 #	rsync -a $(work_dir)/rv64i_m/ $(wally_workdir)/rv64i_m/ || echo "error suppressed"
 
 wally32e:
-	sed 's,{0},$(current_dir),g;s,{1},32e,g' config.ini > config32e.ini
 	riscof run --work-dir=$(work_dir) --config=config32e.ini --suite=$(wally_dir)/riscv-test-suite/ --env=$(wally_dir)/riscv-test-suite/env --no-browser --no-dut-run
 	rsync -a $(work_dir)/rv32i_m/ $(wally_workdir)/rv32i_m/ || echo "error suppressed"
 	rsync -a $(work_dir)/rv32e_unratified/ $(wally_workdir)/rv32e_unratified/ || echo "error suppressed"