diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 1c49b3fe3..336295e51 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -2535,6 +2535,9 @@ int riscv013_test_compliance(struct target *target) {
   // DCSR.ebreak
   // DCSR.prv
 
+  /* Halt every hart for any follow-up tests*/
+  riscv_halt_all_harts(target);
+
   LOG_INFO("PASSED %d of %d TESTS\n", passed_tests, total_tests);
 
   if (total_tests == passed_tests) {