diff --git a/regression/Makefile b/regression/Makefile
index 4b716828..b1218cfd 100644
--- a/regression/Makefile
+++ b/regression/Makefile
@@ -220,16 +220,16 @@ install_openocd: $(OPENOCD_DIR)/bin/openocd
 # Running a list of tests is not supported.
 JTAG_DTM_TEST ?= SimpleRegisterTest.test_s0
 
-stamps/%/jtag-dtm-32-$(JTAG_DTM_TEST).stamp: install_openocd stamps/%/vsim-debug.stamp
+stamps/%/jtag-dtm-32-$(JTAG_DTM_TEST).stamp: install_openocd stamps/%/vsim-ndebug.stamp
 	$(abspath $(TOP))/riscv-tools/riscv-tests/debug/gdbserver.py \
-	--run "$(abspath $(TOP))/vsim/simv-$(PROJECT)-$*-debug +verbose +vcdplusfile=foo.vpd" \
+	--run "$(abspath $(TOP))/vsim/simv-$(PROJECT)-$*" \
 	--cmd="$(OPENOCD_DIR)/bin/openocd -d \
 	--s $(OPENOCD_DIR)/share/openocd/scripts" \
 	--freedom-e300-sim \
 	$(JTAG_DTM_TEST)
 	date > $@
 
-stamps/%/jtag-dtm-64-$(JTAG_DTM_TEST).stamp: install_openocd stamps/%/vsim-debug.stamp
+stamps/%/jtag-dtm-64-$(JTAG_DTM_TEST).stamp: install_openocd stamps/%/vsim-ndebug.stamp
 	$(abspath $(TOP))/riscv-tools/riscv-tests/debug/gdbserver.py \
 	--run $(abspath $(TOP))/vsim/simv-$(PROJECT)-$* \
 	--cmd="$(OPENOCD_INSTALL)_$(OPENOCD_VERSION)/bin/openocd -d \