diff --git a/Makefile b/Makefile
index d5ac81fba741138e884866e4981bef68847c60e3..91b5b4a88d71f741a8bd8d614baee3f1b2b4ad87 100644
--- a/Makefile
+++ b/Makefile
@@ -56,6 +56,7 @@ $(SIM_TOP_V): $(SCALA_FILE) $(TEST_FILE)
 	date -R
 	mill XiangShan.test.runMain $(SIMTOP) -X verilog -td $(@D) --full-stacktrace --output-file $(@F) $(SIM_ARGS)
 	sed -i '/module XSSimTop/,/endmodule/d' $(SIM_TOP_V)
+	sed -i -e 's/$$fatal/$$stop/g' $(SIM_TOP_V)
 	date -R
 
 EMU_TOP      = XSSimSoC
diff --git a/src/test/csrc/emu.cpp b/src/test/csrc/emu.cpp
index 4f1d45e4c45f367e0b5ff154bc0eb54697525a47..292bd82627442eace5bf859f2d1ee34ab3462100 100644
--- a/src/test/csrc/emu.cpp
+++ b/src/test/csrc/emu.cpp
@@ -243,7 +243,7 @@ uint64_t Emulator::execute(uint64_t max_cycle, uint64_t max_instr) {
   diff.wdata = wdata;
   diff.wdst = wdst;
 
-  while (trapCode == STATE_RUNNING) {
+  while (!Verilated::gotFinish() && trapCode == STATE_RUNNING) {
     if (!(max_cycle > 0 && max_instr > 0 && instr_left_last_cycle >= max_instr /* handle overflow */)) {
       trapCode = STATE_LIMIT_EXCEEDED;
       break;
@@ -320,6 +320,11 @@ uint64_t Emulator::execute(uint64_t max_cycle, uint64_t max_instr) {
 #endif
   }
 
+  if (Verilated::gotFinish()) {
+    eprintf("The simulation stopped. There might be some assertion failed.\n");
+    trapCode = STATE_ABORT;
+  }
+
 #if VM_TRACE == 1
   if (enable_waveform) tfp->close();
 #endif