diff --git a/pipelined/testbench/testbench.sv b/pipelined/testbench/testbench.sv
index 92971f5c4..3aa123fc3 100644
--- a/pipelined/testbench/testbench.sv
+++ b/pipelined/testbench/testbench.sv
@@ -89,8 +89,8 @@ logic [3:0] dummy;
                           if (`ZICSR_SUPPORTED) tests = {arch64c, arch64cpriv};
                           else                  tests = {arch64c};
         "arch64m":      if (`M_SUPPORTED) tests = arch64m;
-        "arch64f":      if (`D_SUPPORTED) tests = arch64f;
-        "arch32f":      if (`F_SUPPORTED) tests = arch32f;  // 32-bit FP tests r        "arch64d":      if (`D_SUPPORTED) tests = arch64d;
+        "arch64f":      if (`F_SUPPORTED) tests = arch64f;
+        "arch64d":      if (`D_SUPPORTED) tests = arch64d;  
         "imperas64i":                     tests = imperas64i;
         "imperas64f":   if (`F_SUPPORTED) tests = imperas64f;
         "imperas64d":   if (`D_SUPPORTED) tests = imperas64d;
diff --git a/tests/riscof/Makefile b/tests/riscof/Makefile
index c71ce4473..63f949006 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 fsd_fld_tempfix arch32 wally32  wally32e arch64 wally64
-#all: root fsd_fld_tempfix arch64
+#all: root fsd_fld_tempfix arch32 wally32  wally32e arch64 wally64
+all: root fsd_fld_tempfix wally32
 
 root:
 	mkdir -p $(work_dir)
diff --git a/tests/riscof/sail_cSim/riscof_sail_cSim.py b/tests/riscof/sail_cSim/riscof_sail_cSim.py
index 9a548b7ad..aa32757ca 100644
--- a/tests/riscof/sail_cSim/riscof_sail_cSim.py
+++ b/tests/riscof/sail_cSim/riscof_sail_cSim.py
@@ -129,4 +129,4 @@ class sail_cSim(pluginTemplate):
             make.add_target(execute)
 #        make.execute_all(self.work_dir)
 # DH 7/26/22 increase timeout so sim will finish on slow machines
-        make.execute_all(self.work_dir, timeout = 600)
+        make.execute_all(self.work_dir, timeout = 1800)
diff --git a/tests/riscof/spike/riscof_spike.py b/tests/riscof/spike/riscof_spike.py
index 4f74c72f4..d7d65c0b3 100644
--- a/tests/riscof/spike/riscof_spike.py
+++ b/tests/riscof/spike/riscof_spike.py
@@ -180,7 +180,10 @@ class spike(pluginTemplate):
 
       # once the make-targets are done and the makefile has been created, run all the targets in
       # parallel using the make command set above.
-      make.execute_all(self.work_dir)
+      #make.execute_all(self.work_dir)
+      # DH 7/26/22 increase timeout to 1800 seconds so sim will finish on slow machines
+      make.execute_all(self.work_dir, timeout = 1800) 
+
 
       # if target runs are not required then we simply exit as this point after running all
       # the makefile targets.