diff --git a/riscv-test-suite/env/arch_test.h b/riscv-test-suite/env/arch_test.h
index ae8ff7aa1..80a150505 100644
--- a/riscv-test-suite/env/arch_test.h
+++ b/riscv-test-suite/env/arch_test.h
@@ -1878,7 +1878,7 @@ rvtest_\__MODE__\()end:
 rvtest_init:                            //instantiate prologs here
   INSTANTIATE_MODE_MACRO RVTEST_TRAP_PROLOG
 rvtest_entrypoint:
-  RVMODEL_BOOT
+// RVMODEL_BOOT                        // Commenting this one as temporary fix
   RVTEST_INIT_GPRS                      // 0xF0E1D2C3B4A59687
 rvtest_code_begin:
  .option pop