diff --git a/src/target/riscv/opcodes.h b/src/target/riscv/opcodes.h
index c4d9baf6f..a27a3dcba 100644
--- a/src/target/riscv/opcodes.h
+++ b/src/target/riscv/opcodes.h
@@ -210,6 +210,9 @@ static uint32_t ebreak(void) { return MATCH_EBREAK; }
 static uint32_t ebreak_c(void) __attribute__ ((unused));
 static uint32_t ebreak_c(void) { return MATCH_C_EBREAK; }
 
+static uint32_t wfi(void) __attribute__ ((unused));
+static uint32_t wfi(void) { return MATCH_WFI; }
+
 static uint32_t fence_i(void) __attribute__ ((unused));
 static uint32_t fence_i(void)
 {
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index a68594c9e..506c3c6de 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -2330,6 +2330,8 @@ int riscv013_test_compliance(struct target *target) {
     riscv_program_init(&program, target);
     riscv_addr_t addr = riscv_program_alloc_x(&program);
     riscv_program_lx(&program, GDB_REGNO_S0, addr);
+    // Also testing that WFI() is a NOP during debug mode.
+    riscv_program_insert(&program, wfi());
     riscv_program_addi(&program, GDB_REGNO_S0, GDB_REGNO_S0, 1);
     riscv_program_sx(&program, GDB_REGNO_S0, addr);
     riscv_program_write_ram(&program, addr + 4, 0);
@@ -2366,6 +2368,8 @@ int riscv013_test_compliance(struct target *target) {
     COMPLIANCE_TEST(testvar == riscv_read_debug_buffer_x(target, d_addr), \
 		    "ABSTRACTAUTO should cause COMMAND to run the expected number of times.");
   }
+
+  // DCSR Tests
   
   LOG_INFO("PASSED %d of %d TESTS\n", passed_tests, total_tests);