diff --git a/linux/Makefile b/linux/Makefile
index 6f7b6c7fb..06bc30752 100644
--- a/linux/Makefile
+++ b/linux/Makefile
@@ -29,9 +29,9 @@ OBJDUMPS := $(foreach name, $(OBJDUMPS), $(DIS)/$(name).objdump)
 
 .PHONY: all generate disassemble install clean cleanDTB cleanDriver test
 
-all: clean download Image disassemble install
+all: clean download Image disassemble install dumptvs
 
-all_nosudo: clean download Image disassemble install_nosudo
+all_nosudo: clean download Image disassemble install_nosudo dumptvs_nosudo
 
 Image:
 	bash -c "unset LD_LIBRARY_PATH; make -C $(BUILDROOT) --jobs;"
diff --git a/linux/testvector-generation/genInitMem.sh b/linux/testvector-generation/genInitMem.sh
index b9c1d8c41..c4c3c7291 100755
--- a/linux/testvector-generation/genInitMem.sh
+++ b/linux/testvector-generation/genInitMem.sh
@@ -10,20 +10,20 @@ rawUntrimmedBootmemFile="$tvDir/untrimmedBootmemFileGDB.bin"
 untrimmedBootmemFile="$tvDir/untrimmedBootmemFile.bin"
 DEVICE_TREE=${imageDir}/wally-virt.dtb
 
-if [ ! -d "$tvDir" ]; then
-    echo "Error: linux testvector directory $tvDir not found!">&2
-    echo "Please create it. For example:">&2
-    echo "    sudo mkdir -p $tvDir">&2
+if ! mkdir -p "$tvDir"; then
+    echo "Error: unable to create linux testvector directory $tvDir!">&2
+    echo "Please try running as sudo.">&2
     exit 1
 fi
-test -w $tvDir
-if [ ! $? -eq 0 ]; then
-    echo "Error: insuffcient write privileges for linux testvector directory $tvDir !">&2
-    echo "Please chmod it. For example:">&2
-    echo "    sudo chmod -R a+rw $tvDir">&2
-    exit 1
+if ! test -w "$tvDir"; then
+    echo "Using sudo to gain access to $tvDir"
+    if ! sudo chmod -R a+rw "$tvDir"; then
+        echo "Error: insuffcient write privileges for linux testvector directory $tvDir !">&2
+        echo "Please chmod it. For example:">&2
+        echo "    sudo chmod -R a+rw $tvDir">&2
+        exit 1
+    fi
 fi
-
 echo "Launching QEMU in replay mode!"
 (qemu-system-riscv64 \
 -M virt -m 256M -dtb $DEVICE_TREE \