diff --git a/Makefrag b/Makefrag
index 1734a205..494b2238 100644
--- a/Makefrag
+++ b/Makefrag
@@ -46,3 +46,37 @@ $(FIRRTL_FILE) $(ANNO_FILE): $(rocketchip_stamp) $(extra_stamps) $(call lookup_s
 
 $(VERILOG_FILE): $(FIRRTL_FILE) $(ANNO_FILE) $(FIRRTL_JAR)
 	$(FIRRTL) -i $(FIRRTL_FILE) -o $(VERILOG_FILE) -X verilog -faf $(ANNO_FILE)
+
+regression-tests = \
+	rv64ud-v-fcvt \
+        rv64ud-p-fdiv \
+        rv64ud-v-fadd \
+        rv64uf-v-fadd \
+        rv64um-v-mul \
+        rv64mi-p-breakpoint \
+        rv64uc-v-rvc \
+        rv64ud-v-structural \
+        rv64si-p-wfi \
+        rv64um-v-divw \
+        rv64ua-v-lrsc \
+        rv64ui-v-fence_i \
+        rv64ud-v-fcvt_w \
+        rv64uf-v-fmin \
+        rv64ui-v-sb \
+        rv64ua-v-amomax_d \
+        rv64ud-v-move \
+        rv64ud-v-fclass \
+        rv64ua-v-amoand_d \
+        rv64ua-v-amoxor_d \
+        rv64si-p-sbreak \
+        rv64ud-v-fmadd \
+        rv64uf-v-ldst \
+        rv64um-v-mulh \
+        rv64si-p-dirty
+
+output_dir=$(sim_dir)/output
+
+$(output_dir)/%: $(RISCV)/riscv64-unknown-elf/share/riscv-tests/isa/%
+	mkdir -p $(output_dir)
+	ln -sf $< $@
+
diff --git a/verisim/Makefile b/verisim/Makefile
index afb75469..8ab1100f 100644
--- a/verisim/Makefile
+++ b/verisim/Makefile
@@ -65,5 +65,22 @@ $(model_mk_debug): $(sim_vsrcs) $(INSTALLED_VERILATOR)
 $(sim_debug): $(model_mk_debug) $(sim_csrcs)
 	$(MAKE) VM_PARALLEL_BUILDS=1 -C $(build_dir)/$(long_name).debug -f V$(MODEL).mk
 
+$(output_dir)/%.out: $(output_dir)/% $(sim)
+	$(sim) +verbose +max-cycles=1000000 $< 3>&1 1>&2 2>&3 | spike-dasm > $@
+
+$(output_dir)/%.run: $(output_dir)/% $(sim)
+	$(sim) +max-cycles=1000000 $< && touch $@
+
+$(output_dir)/%.vpd: $(output_dir)/% $(sim_debug)
+	rm -f $@.vcd && mkfifo $@.vcd
+	vcd2vpd $@.vcd $@ > /dev/null &
+	$(sim_debug) -v$@.vcd +max-cycles=1000000 $<
+
+run-regression-tests: $(addprefix $(output_dir)/,$(addsuffix .out,$(regression-tests)))
+
+run-regression-tests-fast: $(addprefix $(output_dir)/,$(addsuffix .run,$(regression-tests)))
+
+run-regression-tests-debug: $(addprefix $(output_dir)/,$(addsuffix .vpd,$(regression-tests)))
+
 clean:
 	rm -rf generated-src ./simulator-*
diff --git a/vsim/Makefile b/vsim/Makefile
index eb5a7026..e6b14bd2 100644
--- a/vsim/Makefile
+++ b/vsim/Makefile
@@ -7,8 +7,8 @@ CONFIG ?= DefaultExampleConfig
 CFG_PROJECT ?= $(PROJECT)
 TB ?= TestDriver
 
-simv = simv-$(PROJECT)-$(CONFIG)
-simv_debug = simv-$(PROJECT)-$(CONFIG)-debug
+simv = $(sim_dir)/simv-$(PROJECT)-$(CONFIG)
+simv_debug = $(sim_dir)/simv-$(PROJECT)-$(CONFIG)-debug
 
 default: $(simv)
 
@@ -59,6 +59,21 @@ $(simv_debug) : $(sim_vsrcs) $(sim_csrcs)
 	rm -rf csrc && $(VCS) $(VCS_OPTS) -o $@ \
 	+define+DEBUG -debug_pp
 
+$(output_dir)/%.out: $(output_dir)/% $(simv)
+	$(simv) +verbose +max-cycles=1000000 $< 3>&1 1>&2 2>&3 | spike-dasm > $@
+
+$(output_dir)/%.run: $(output_dir)/% $(simv)
+	$(simv) +max-cycles=1000000 $< && touch $@
+
+$(output_dir)/%.vpd: $(output_dir)/% $(simv_debug)
+	$(simv_debug) +vcdplusfile=$@ +max-cycles=1000000 $<
+
+run-regression-tests: $(addprefix $(output_dir)/,$(addsuffix .out,$(regression-tests)))
+
+run-regression-tests-fast: $(addprefix $(output_dir)/,$(addsuffix .run,$(regression-tests)))
+
+run-regression-tests-debug: $(addprefix $(output_dir)/,$(addsuffix .vpd,$(regression-tests)))
+
 clean:
 	rm -rf generated-src csrc simv-* ucli.key vc_hdrs.h