diff --git a/Makefile b/Makefile
index 9086d20..ddb716e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,134 +1,134 @@
-GHDL=ghdl
-GHDLFLAGS=--std=08 -Psim-unisim
+GHDL ?= ghdl
+GHDLFLAGS=--std=08 --work=unisim
 CFLAGS=-O2 -Wall
 
+GHDLSYNTH ?= ghdl.so
+YOSYS     ?= yosys
+NEXTPNR   ?= nextpnr-ecp5
+ECPPACK   ?= ecppack
+OPENOCD   ?= openocd
+
 # We need a version of GHDL built with either the LLVM or gcc backend.
-# Fedora provides this, but other distros may not. Another option, although
-# rather slow, is to use the Docker image.
-#
-# Uncomment one of these to build with Docker or podman
-#DOCKER=docker
-#DOCKER=podman
-#
-# Uncomment these lines to build with Docker/podman
-#PWD = $(shell pwd)
-#DOCKERARGS = run --rm -v $(PWD):/src:z -w /src
-#GHDL = $(DOCKER) $(DOCKERARGS) ghdl/ghdl:buster-llvm-7 ghdl
-#CC = $(DOCKER) $(DOCKERARGS) ghdl/ghdl:buster-llvm-7 gcc
-
-all = core_tb soc_reset_tb icache_tb dcache_tb multiply_tb dmi_dtm_tb divider_tb \
-	rotator_tb countzero_tb wishbone_bram_tb
-
-# XXX
-# loadstore_tb fetch_tb
+# Fedora provides this, but other distros may not. Another option is to use
+# the Docker image.
+DOCKER ?= 0
+PODMAN ?= 0
+
+ifeq ($(DOCKER), 1)
+DOCKERBIN=docker
+USE_DOCKER=1
+endif
+
+ifeq ($(PODMAN), 1)
+DOCKERBIN=podman
+USE_DOCKER=1
+endif
+
+ifeq ($(USE_DOCKER), 1)
+PWD = $(shell pwd)
+DOCKERARGS = run --rm -v $(PWD):/src:z -w /src
+GHDL      = $(DOCKERBIN) $(DOCKERARGS) ghdl/ghdl:buster-llvm-7 ghdl
+CC        = $(DOCKERBIN) $(DOCKERARGS) ghdl/ghdl:buster-llvm-7 gcc
+GHDLSYNTH = ghdl
+YOSYS     = $(DOCKERBIN) $(DOCKERARGS) ghdl/synth:beta yosys
+NEXTPNR   = $(DOCKERBIN) $(DOCKERARGS) ghdl/synth:nextpnr-ecp5 nextpnr-ecp5
+ECPPACK   = $(DOCKERBIN) $(DOCKERARGS) ghdl/synth:trellis ecppack
+OPENOCD   = $(DOCKERBIN) $(DOCKERARGS) --device /dev/bus/usb ghdl/synth:prog openocd
+endif
+
+all = core_tb icache_tb dcache_tb multiply_tb dmi_dtm_tb divider_tb \
+	rotator_tb countzero_tb wishbone_bram_tb soc_reset_tb
 
 all: $(all)
 
-%.o : %.vhdl
-	$(GHDL) -a $(GHDLFLAGS) --workdir=$(shell dirname $@) $<
-
-common.o: decode_types.o
-control.o: gpr_hazard.o cr_hazard.o common.o
-sim_jtag.o: sim_jtag_socket.o
-core_tb.o: common.o wishbone_types.o core.o soc.o sim_jtag.o
-core.o: common.o wishbone_types.o fetch1.o fetch2.o icache.o decode1.o decode2.o register_file.o cr_file.o execute1.o loadstore1.o mmu.o dcache.o writeback.o core_debug.o
-core_debug.o: common.o
-countzero.o:
-countzero_tb.o: common.o glibc_random.o countzero.o
-cr_file.o: common.o
-crhelpers.o: common.o
-decode1.o: common.o decode_types.o
-decode2.o: decode_types.o common.o helpers.o insn_helpers.o control.o
-decode_types.o:
-execute1.o: decode_types.o common.o helpers.o crhelpers.o insn_helpers.o ppc_fx_insns.o rotator.o logical.o countzero.o multiply.o divider.o
-fetch1.o: common.o
-fetch2.o: common.o wishbone_types.o
-glibc_random_helpers.o:
-glibc_random.o: glibc_random_helpers.o
-helpers.o:
-cache_ram.o:
-plru.o:
-plru_tb.o: plru.o
-utils.o:
-sim_bram.o: sim_bram_helpers.o utils.o
-wishbone_bram_wrapper.o: wishbone_types.o sim_bram.o utils.o
-wishbone_bram_tb.o: wishbone_bram_wrapper.o
-icache.o: utils.o common.o wishbone_types.o plru.o cache_ram.o utils.o
-icache_tb.o: common.o wishbone_types.o icache.o wishbone_bram_wrapper.o
-dcache.o: utils.o common.o wishbone_types.o plru.o cache_ram.o utils.o
-dcache_tb.o: common.o wishbone_types.o dcache.o wishbone_bram_wrapper.o
-insn_helpers.o:
-loadstore1.o: common.o decode_types.o
-logical.o: decode_types.o
-multiply_tb.o: decode_types.o common.o glibc_random.o ppc_fx_insns.o multiply.o
-multiply.o: common.o decode_types.o
-mmu.o: common.o
-divider_tb.o: decode_types.o common.o glibc_random.o ppc_fx_insns.o divider.o
-divider.o: common.o decode_types.o
-ppc_fx_insns.o: helpers.o
-register_file.o: common.o
-rotator.o: common.o
-rotator_tb.o: common.o glibc_random.o ppc_fx_insns.o insn_helpers.o rotator.o
-sim_console.o:
-sim_uart.o: wishbone_types.o sim_console.o
-xics.o: wishbone_types.o common.o
-soc.o: common.o wishbone_types.o core.o wishbone_arbiter.o sim_uart.o wishbone_bram_wrapper.o dmi_dtm_xilinx.o wishbone_debug_master.o xics.o syscon.o
-syscon.o: wishbone_types.o
-wishbone_arbiter.o: wishbone_types.o
-wishbone_types.o:
-writeback.o: common.o crhelpers.o
-dmi_dtm_tb.o: dmi_dtm_xilinx.o wishbone_debug_master.o
-dmi_dtm_xilinx.o: wishbone_types.o sim-unisim/unisim_vcomponents.o
-wishbone_debug_master.o: wishbone_types.o
-
-UNISIM_BITS = sim-unisim/unisim_vcomponents.vhdl sim-unisim/BSCANE2.vhdl sim-unisim/BUFG.vhdl
-sim-unisim/unisim_vcomponents.o: $(UNISIM_BITS)
-	$(GHDL) -a $(GHDLFLAGS) --work=unisim --workdir=sim-unisim $^
-
-
-fpga/soc_reset_tb.o: fpga/soc_reset.o
-
-soc_reset_tb: fpga/soc_reset_tb.o fpga/soc_reset.o
-	$(GHDL) -e $(GHDLFLAGS) --workdir=fpga soc_reset_tb
-
-core_tb: core_tb.o sim_vhpi_c.o sim_bram_helpers_c.o sim_console_c.o sim_jtag_socket_c.o
-	$(GHDL) -e $(GHDLFLAGS) -Wl,sim_vhpi_c.o -Wl,sim_bram_helpers_c.o -Wl,sim_console_c.o -Wl,sim_jtag_socket_c.o $@
-
-fetch_tb: fetch_tb.o
-	$(GHDL) -e $(GHDLFLAGS) $@
-
-icache_tb: icache_tb.o sim_vhpi_c.o sim_bram_helpers_c.o
-	$(GHDL) -e $(GHDLFLAGS) -Wl,sim_vhpi_c.o -Wl,sim_bram_helpers_c.o $@
-
-dcache_tb: dcache_tb.o sim_vhpi_c.o sim_bram_helpers_c.o
-	$(GHDL) -e $(GHDLFLAGS) -Wl,sim_vhpi_c.o -Wl,sim_bram_helpers_c.o $@
-
-plru_tb: plru_tb.o
-	$(GHDL) -e $(GHDLFLAGS) $@
-
-loadstore_tb: loadstore_tb.o
-	$(GHDL) -e $(GHDLFLAGS) $@
-
-multiply_tb: multiply_tb.o
-	$(GHDL) -e $(GHDLFLAGS) $@
-
-divider_tb: divider_tb.o
-	$(GHDL) -e $(GHDLFLAGS) $@
-
-rotator_tb: rotator_tb.o
-	$(GHDL) -e $(GHDLFLAGS) $@
-
-countzero_tb: countzero_tb.o
-	$(GHDL) -e $(GHDLFLAGS) $@
-
-simple_ram_tb: simple_ram_tb.o
-	$(GHDL) -e $(GHDLFLAGS) $@
-
-wishbone_bram_tb: sim_vhpi_c.o sim_bram_helpers_c.o wishbone_bram_tb.o
-	$(GHDL) -e $(GHDLFLAGS) -Wl,sim_vhpi_c.o -Wl,sim_bram_helpers_c.o $@
-
-dmi_dtm_tb: dmi_dtm_tb.o sim_vhpi_c.o sim_bram_helpers_c.o
-	$(GHDL) -e $(GHDLFLAGS) -Wl,sim_vhpi_c.o -Wl,sim_bram_helpers_c.o $@
+core_files = decode_types.vhdl common.vhdl wishbone_types.vhdl fetch1.vhdl \
+	fetch2.vhdl utils.vhdl plru.vhdl cache_ram.vhdl icache.vhdl \
+	decode1.vhdl helpers.vhdl insn_helpers.vhdl gpr_hazard.vhdl \
+	cr_hazard.vhdl control.vhdl decode2.vhdl register_file.vhdl \
+	cr_file.vhdl crhelpers.vhdl ppc_fx_insns.vhdl rotator.vhdl \
+	logical.vhdl countzero.vhdl multiply.vhdl divider.vhdl execute1.vhdl \
+	loadstore1.vhdl mmu.vhdl dcache.vhdl writeback.vhdl core_debug.vhdl \
+	core.vhdl
+
+soc_files = wishbone_arbiter.vhdl wishbone_bram_wrapper.vhdl \
+	wishbone_debug_master.vhdl xics.vhdl syscon.vhdl soc.vhdl
+
+soc_sim_files = sim_console.vhdl sim_uart.vhdl sim_bram_helpers.vhdl \
+	sim_bram.vhdl sim_jtag_socket.vhdl sim_jtag.vhdl \
+	sim-unisim/BSCANE2.vhdl sim-unisim/BUFG.vhdl \
+	sim-unisim/unisim_vcomponents.vhdl dmi_dtm_xilinx.vhdl
+
+soc_sim_c_files = sim_vhpi_c.c sim_bram_helpers_c.c sim_console_c.c \
+	sim_jtag_socket_c.c
+soc_sim_obj_files=$(soc_sim_c_files:.c=.o)
+comma := ,
+soc_sim_link=$(patsubst %,-Wl$(comma)%,$(soc_sim_obj_files))
+
+core_tbs = multiply_tb divider_tb rotator_tb countzero_tb
+soc_tbs = core_tb icache_tb dcache_tb dmi_dtm_tb wishbone_bram_tb
+
+$(soc_tbs): %: $(core_files) $(soc_files) $(soc_sim_files) $(soc_sim_obj_files) %.vhdl
+	$(GHDL) -c $(GHDLFLAGS) $(soc_sim_link) $(core_files) $(soc_files) $(soc_sim_files) $@.vhdl -e $@
+
+$(core_tbs): %: $(core_files) glibc_random.vhdl glibc_random_helpers.vhdl %.vhdl
+	$(GHDL) -c $(GHDLFLAGS) $(core_files) glibc_random.vhdl glibc_random_helpers.vhdl $@.vhdl -e $@
+
+soc_reset_tb: fpga/soc_reset_tb.vhdl fpga/soc_reset.vhdl
+	$(GHDL) -c $(GHDLFLAGS) fpga/soc_reset_tb.vhdl fpga/soc_reset.vhdl -e $@
+
+# Hello world
+GHDL_IMAGE_GENERICS=-gMEMORY_SIZE=8192 -gRAM_INIT_FILE=hello_world/hello_world.hex
+
+# Micropython
+#GHDL_IMAGE_GENERICS=-gMEMORY_SIZE=393216 -gRAM_INIT_FILE=micropython/firmware.hex
+
+# OrangeCrab with ECP85
+GHDL_TARGET_GENERICS=-gRESET_LOW=true -gCLK_INPUT=50000000 -gCLK_FREQUENCY=50000000
+LPF=constraints/orange-crab.lpf
+PACKAGE=CSFBGA285
+NEXTPNR_FLAGS=--um5g-85k --freq 50
+OPENOCD_JTAG_CONFIG=openocd/olimex-arm-usb-tiny-h.cfg
+OPENOCD_DEVICE_CONFIG=openocd/LFE5UM5G-85F.cfg
+
+# ECP5-EVN
+#GHDL_TARGET_GENERICS=-gRESET_LOW=true -gCLK_INPUT=12000000 -gCLK_FREQUENCY=12000000
+#LPF=constraints/ecp5-evn.lpf
+#PACKAGE=CABGA381
+#NEXTPNR_FLAGS=--um5g-85k --freq 12
+#OPENOCD_JTAG_CONFIG=openocd/ecp5-evn.cfg
+#OPENOCD_DEVICE_CONFIG=openocd/LFE5UM5G-85F.cfg
+
+clkgen=fpga/clk_gen_bypass.vhd
+toplevel=fpga/top-generic.vhdl
+dmi_dtm=dmi_dtm_dummy.vhdl
+
+fpga_files = $(core_files) $(soc_files) fpga/soc_reset.vhdl \
+	fpga/pp_fifo.vhd fpga/pp_soc_uart.vhd fpga/main_bram.vhdl
+
+synth_files = $(core_files) $(soc_files) $(fpga_files) $(clkgen) $(toplevel) $(dmi_dtm)
+
+microwatt.json: $(synth_files)
+	$(YOSYS) -m $(GHDLSYNTH) -p "ghdl --std=08 $(GHDL_IMAGE_GENERICS) $(GHDL_TARGET_GENERICS) $(synth_files) -e toplevel; synth_ecp5 -json $@"
+
+microwatt.v: $(synth_files)
+	$(YOSYS) -m $(GHDLSYNTH) -p "ghdl --std=08 $(GHDL_IMAGE_GENERICS) $(GHDL_TARGET_GENERICS) $(synth_files) -e toplevel; write_verilog $@"
+
+# Need to investigate why yosys is hitting verilator warnings, and eventually turn on -Wall
+microwatt-verilator: microwatt.v verilator/microwatt-verilator.cpp verilator/uart-verilator.c
+	verilator -O3 --assert --cc microwatt.v --exe verilator/microwatt-verilator.cpp verilator/uart-verilator.c -o $@ -Wno-CASEOVERLAP -Wno-UNOPTFLAT #--trace
+	make -C obj_dir -f Vmicrowatt.mk
+	@cp -f obj_dir/microwatt-verilator microwatt-verilator
+
+microwatt_out.config: microwatt.json $(LPF)
+	$(NEXTPNR) --json $< --lpf $(LPF) --textcfg $@ $(NEXTPNR_FLAGS) --package $(PACKAGE)
+
+microwatt.bit: microwatt_out.config
+	$(ECPPACK) --svf microwatt.svf $< $@
+
+microwatt.svf: microwatt.bit
+
+prog: microwatt.svf
+	$(OPENOCD) -f $(OPENOCD_JTAG_CONFIG) -f $(OPENOCD_DEVICE_CONFIG) -c "transport select jtag; init; svf $<; exit"
 
 tests = $(sort $(patsubst tests/%.out,%,$(wildcard tests/*.out)))
 tests_console = $(sort $(patsubst tests/%.console_out,%,$(wildcard tests/*.console_out)))
@@ -161,6 +161,9 @@ _clean:
 	rm -f TAGS
 	rm -f scripts/mw_debug/*.o
 	rm -f scripts/mw_debug/mw_debug
+	rm -f microwatt.bin microwatt.json microwatt.svf microwatt_out.config
+	rm -f microwatt.v microwatt-verilator
+	rm -rf obj_dir/
 
 clean: _clean
 	make -f scripts/mw_debug/Makefile clean
@@ -174,3 +177,6 @@ distclean: _clean
 	rm -f litedram/gen-src/sdram_init/*~
 	make -f scripts/mw_debug/Makefile distclean
 	make -f hello_world/Makefile distclean
+
+.PHONY: all prog check check_light clean distclean
+.PRECIOUS: microwatt.json microwatt_out.config microwatt.bit
diff --git a/Makefile.synth b/Makefile.synth
deleted file mode 100644
index f7bdc5b..0000000
--- a/Makefile.synth
+++ /dev/null
@@ -1,88 +0,0 @@
-# Use local tools
-#GHDLSYNTH = ghdl.so
-#YOSYS     = yosys
-#NEXTPNR   = nextpnr-ecp5
-#ECPPACK   = ecppack
-#OPENOCD    = openocd
-
-# Use Docker images
-DOCKER=docker
-#DOCKER=podman
-#
-PWD = $(shell pwd)
-DOCKERARGS = run --rm -v $(PWD):/src:z -w /src
-#
-GHDLSYNTH = ghdl
-YOSYS     = $(DOCKER) $(DOCKERARGS) ghdl/synth:beta yosys
-NEXTPNR   = $(DOCKER) $(DOCKERARGS) ghdl/synth:nextpnr-ecp5 nextpnr-ecp5
-ECPPACK   = $(DOCKER) $(DOCKERARGS) ghdl/synth:trellis ecppack
-OPENOCD   = $(DOCKER) $(DOCKERARGS) --device /dev/bus/usb ghdl/synth:prog openocd
-
-
-# Hello world
-GHDL_IMAGE_GENERICS=-gMEMORY_SIZE=8192 -gRAM_INIT_FILE=hello_world/hello_world.hex
-
-# Micropython
-#GHDL_IMAGE_GENERICS=-gMEMORY_SIZE=393216 -gRAM_INIT_FILE=micropython/firmware.hex
-
-
-# OrangeCrab with ECP85
-#GHDL_TARGET_GENERICS=-gRESET_LOW=true -gCLK_INPUT=50000000 -gCLK_FREQUENCY=50000000
-#LPF=constraints/orange-crab.lpf
-#PACKAGE=CSFBGA285
-#NEXTPNR_FLAGS=--um5g-85k --freq 50
-#OPENOCD_JTAG_CONFIG=openocd/olimex-arm-usb-tiny-h.cfg
-#OPENOCD_DEVICE_CONFIG=openocd/LFE5UM5G-85F.cfg
-
-# ECP5-EVN
-GHDL_TARGET_GENERICS=-gRESET_LOW=true -gCLK_INPUT=12000000 -gCLK_FREQUENCY=12000000
-LPF=constraints/ecp5-evn.lpf
-PACKAGE=CABGA381
-NEXTPNR_FLAGS=--um5g-85k --freq 12
-OPENOCD_JTAG_CONFIG=openocd/ecp5-evn.cfg
-OPENOCD_DEVICE_CONFIG=openocd/LFE5UM5G-85F.cfg
-
-VHDL_FILES  = fpga/soc_reset.vhdl fpga/clk_gen_bypass.vhd decode_types.vhdl
-VHDL_FILES += common.vhdl wishbone_types.vhdl wishbone_debug_master.vhdl
-VHDL_FILES += wishbone_arbiter.vhdl cache_ram.vhdl utils.vhdl plru.vhdl
-VHDL_FILES += helpers.vhdl mmu.vhdl dcache.vhdl core_debug.vhdl fetch1.vhdl fetch2.vhdl
-VHDL_FILES += register_file.vhdl insn_helpers.vhdl multiply.vhdl divider.vhdl
-VHDL_FILES += logical.vhdl crhelpers.vhdl countzero.vhdl rotator.vhdl
-VHDL_FILES += ppc_fx_insns.vhdl execute1.vhdl decode1.vhdl cr_file.vhdl
-VHDL_FILES += writeback.vhdl loadstore1.vhdl icache.vhdl cr_hazard.vhdl
-VHDL_FILES += gpr_hazard.vhdl control.vhdl decode2.vhdl core.vhdl
-VHDL_FILES += fpga/pp_fifo.vhd fpga/pp_soc_uart.vhd dmi_dtm_dummy.vhdl
-VHDL_FILES += fpga/main_bram.vhdl wishbone_bram_wrapper.vhdl syscon.vhdl
-VHDL_FILES += xics.vhdl soc.vhdl fpga/top-generic.vhdl
-
-all: microwatt.bit
-
-microwatt.json: $(VHDL_FILES)
-	$(YOSYS) -m $(GHDLSYNTH) -p "ghdl --std=08 $(GHDL_IMAGE_GENERICS) $(GHDL_TARGET_GENERICS) $(VHDL_FILES) -e toplevel; synth_ecp5 -json $@"
-
-microwatt.v: $(VHDL_FILES)
-	$(YOSYS) -m $(GHDLSYNTH) -p "ghdl --std=08 $(GHDL_IMAGE_GENERICS) $(GHDL_TARGET_GENERICS) $(VHDL_FILES) -e toplevel; write_verilog $@"
-
-microwatt-verilator: microwatt.v verilator/microwatt-verilator.cpp verilator/uart-verilator.c
-	#verilator -O3 -Wall --assert --cc microwatt.v --exe verilator/microwatt-verilator.cpp verilator/uart-verilator.c -o $@ -Wno-CASEOVERLAP -Wno-UNOPTFLAT #--trace
-	verilator -O3 --assert --cc microwatt.v --exe verilator/microwatt-verilator.cpp verilator/uart-verilator.c -o $@ -Wno-CASEOVERLAP -Wno-UNOPTFLAT #--trace
-	make -C obj_dir -f Vmicrowatt.mk
-	@cp -f obj_dir/microwatt-verilator microwatt-verilator
-
-microwatt_out.config: microwatt.json $(LPF)
-	$(NEXTPNR) --json $< --lpf $(LPF) --textcfg $@ $(NEXTPNR_FLAGS) --package $(PACKAGE)
-
-microwatt.bit: microwatt_out.config
-	$(ECPPACK) --svf microwatt.svf $< $@
-
-microwatt.svf: microwatt.bit
-
-prog: microwatt.svf
-	$(OPENOCD) -f $(OPENOCD_JTAG_CONFIG) -f $(OPENOCD_DEVICE_CONFIG) -c "transport select jtag; init; svf $<; exit"
-
-clean:
-	@rm -f work-obj08.cf *.bit *.json *.svf *.config microwatt.v microwatt-verilator
-	@rm -rf obj_dir/
-
-.PHONY: clean prog
-.PRECIOUS: microwatt.json microwatt_out.config microwatt.bit
diff --git a/README.md b/README.md
index 98f2140..e11e56f 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ cd ../../../
   appears not to). ghdl with the LLVM backend is likely easier to build.
 
   If building ghdl from scratch is too much for you, the microwatt Makefile
-  supports using Docker or podman images. Read through the Makefile for details.
+  supports using Docker or Podman.
 
 - Next build microwatt:
 
@@ -45,6 +45,17 @@ cd ../../../
 git clone https://github.com/antonblanchard/microwatt
 cd microwatt
 make
+```
+
+   To build using Docker:
+```
+make DOCKER=1
+```
+
+   and to build using Podman:
+
+```
+make PODMAN=1
 ```
 
 - Link in the micropython image:
diff --git a/countzero_tb.vhdl b/countzero_tb.vhdl
index 21529de..42f6048 100644
--- a/countzero_tb.vhdl
+++ b/countzero_tb.vhdl
@@ -109,7 +109,6 @@ begin
             end loop;
         end loop;
 
-        assert false report "end of test" severity failure;
-        wait;
+	std.env.finish;
     end process;
 end behave;
diff --git a/dcache_tb.vhdl b/dcache_tb.vhdl
index 48c6877..1e2e07b 100644
--- a/dcache_tb.vhdl
+++ b/dcache_tb.vhdl
@@ -133,8 +133,6 @@ begin
 	wait until rising_edge(clk);
 	wait until rising_edge(clk);
 
-        assert false report "end of test" severity failure;
-        wait;
-
+	std.env.finish;
     end process;
 end;
diff --git a/divider_tb.vhdl b/divider_tb.vhdl
index 95156a3..01d1d81 100644
--- a/divider_tb.vhdl
+++ b/divider_tb.vhdl
@@ -547,7 +547,6 @@ begin
             end loop;
         end loop;
 
-        assert false report "end of test" severity failure;
-        wait;
+        std.env.finish;
     end process;
 end behave;
diff --git a/fpga/soc_reset_tb.vhdl b/fpga/soc_reset_tb.vhdl
index 26c6b1e..6c5e1b9 100644
--- a/fpga/soc_reset_tb.vhdl
+++ b/fpga/soc_reset_tb.vhdl
@@ -124,7 +124,6 @@ begin
 
 	wait for clk_period;
 
-        assert false report "end of test" severity failure;
-        wait;
+        std.env.finish;
     end process;
 end behave;
diff --git a/icache_tb.vhdl b/icache_tb.vhdl
index 09a644b..828a610 100644
--- a/icache_tb.vhdl
+++ b/icache_tb.vhdl
@@ -147,8 +147,6 @@ begin
 
         i_out.req <= '0';
 
-        assert false report "end of test" severity failure;
-        wait;
-
+        std.env.finish;
     end process;
 end;
diff --git a/multiply_tb.vhdl b/multiply_tb.vhdl
index 8f1d795..ee80de0 100644
--- a/multiply_tb.vhdl
+++ b/multiply_tb.vhdl
@@ -247,7 +247,7 @@ begin
                 report "bad mulli expected " & to_hstring(behave_rt) & " got " & to_hstring(m2.write_reg_data);
         end loop;
 
-        assert false report "end of test" severity failure;
+        std.env.finish;
         wait;
     end process;
 end behave;
diff --git a/plru_tb.vhdl b/plru_tb.vhdl
index 18512e4..1afbd65 100644
--- a/plru_tb.vhdl
+++ b/plru_tb.vhdl
@@ -103,7 +103,6 @@ begin
 	wait for clk_period;
 	report "lru:" & to_hstring(lru);
 
-        assert false report "end of test" severity failure;
-        wait;
+        std.env.finish;
     end process;
 end;
diff --git a/rotator_tb.vhdl b/rotator_tb.vhdl
index 62a09ce..123058c 100644
--- a/rotator_tb.vhdl
+++ b/rotator_tb.vhdl
@@ -291,7 +291,6 @@ begin
 		report "bad extswsli expected " & to_hstring(behave_ra) & " got " & to_hstring(result);
         end loop;
 
-        assert false report "end of test" severity failure;
-        wait;
+        std.env.finish;
     end process;
 end behave;
diff --git a/wishbone_bram_tb.vhdl b/wishbone_bram_tb.vhdl
index be64db6..c4ffedd 100644
--- a/wishbone_bram_tb.vhdl
+++ b/wishbone_bram_tb.vhdl
@@ -169,7 +169,6 @@ begin
         wait until rising_edge(clk);
         assert w_in.ack = '0';
 
-        assert false report "end of test" severity failure;
-        wait;
+        std.env.finish;
     end process;
 end behave;