diff --git a/testbench/testbench-fp.sv b/testbench/testbench-fp.sv
index 4bc3153df..53001a4bc 100644
--- a/testbench/testbench-fp.sv
+++ b/testbench/testbench-fp.sv
@@ -962,14 +962,18 @@ module testbenchfp;
       // http://www.jhauser.us/arithmetic/TestFloat-3/doc/TestFloat-general.html it says
       // for an unsigned integer result 0 is also okay
 
-      // Testfloat outputs 800... for both the largest integer values for both positive and negitive numbers but 
+      // TestFloat outputs 800... for both the largest integer values for both positive and negitive numbers but 
       // the riscv spec specifies 2^31-1 for positive values out of range and NaNs ie 7fff...
-      else if ((UnitVal === `CVTINTUNIT) & 
-		  ~((ResFlg === AnsFlg | AnsFlg === 5'bx))) begin	 
-	 errors += 1;
-	 $display("There is an error in %s", Tests[TestNum]);
-	 $display("inputs: %h %h %h\nSrcA: %h\n Res: %h %h\n Ans: %h %h", X, Y, Z, SrcA, Res, ResFlg, Ans, AnsFlg);
-	 $stop;
+      else if ( ((UnitVal === `CVTINTUNIT) | (UnitVal === `CMPUNIT)) & ~FlagMatch ) begin
+	 // ResMatch & FlagMatch checks the result again.  It is checked within the
+	 // test again to avoid issues related when the values change tests (e.g., f16_eq_rne -> f16_eq_rz)
+	 if (~(ResMatch & FlagMatch)) begin
+	    errors += 1;
+	    $display("\nError in %s", Tests[TestNum]);
+	    $display("TestNum %d OpCtrl %d", TestNum, OpCtrl[TestNum]);	 	 
+	    $display("inputs: %h %h %h\nSrcA: %h\n Res: %h %h\n Ans: %h %h", X, Y, Z, SrcA, Res, ResFlg, Ans, AnsFlg);
+	    $stop;
+	 end
       end
 
       if (TestVectors[VectorNum][0] === 1'bx & Tests[TestNum] !== "") begin // if reached the eof
diff --git a/tests/riscof/spike/spike_rv64gc_isa.yaml b/tests/riscof/spike/spike_rv64gc_isa.yaml
index 7f1d53f1e..c7fefa587 100644
--- a/tests/riscof/spike/spike_rv64gc_isa.yaml
+++ b/tests/riscof/spike/spike_rv64gc_isa.yaml
@@ -1,8 +1,8 @@
 hart_ids: [0]
 hart0:
-#  ISA: RV64IMAFDCSUZicsr_Zicboz_Zifencei_Zbb_Zbc_Zbs # Zkbs_Zcb
-#  ISA: RV64IMAFDCSUZicsr_Zifencei_Zca_Zcb_Zbb_Zbc_Zbs # Zkbs_Zcb
-  ISA: RV64IMAFDCSUZicsr_Zifencei_Zbb_Zbc_Zbs # Zkbs_Zcb
+#  ISA: RV64IMAFDCSUZicsr_Zicboz_Zifencei_Zba_Zbb_Zbc_Zbs # Zkbs_Zcb
+#  ISA: RV64IMAFDCSUZicsr_Zifencei_Zca_Zcb_Zba_Zbb_Zbc_Zbs # Zkbs_Zcb
+  ISA: RV64IMAFDCSUZicsr_Zifencei_Zba_Zbb_Zbc_Zbs # Zkbs_Zcb
   physical_addr_sz: 56
   User_Spec_Version: '2.3'
   supported_xlen: [64]