diff --git a/VAX/tests/EHKAA.ini b/VAX/tests/EHKAA.ini
deleted file mode 100644
index 16a00fe3..00000000
--- a/VAX/tests/EHKAA.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-load ehkaa.exe
-go 200
-if (PC != 0x80018AD1) echof "\r\n%SIM_NAME% Hardware Core Instruction test EHKAA - FAILED\n"; exit 1
-else                  echof "\r\n%SIM_NAME% Hardware Core Instruction test EHKAA - PASSED\n"; exit 0
diff --git a/VAX/tests/EVKAA.ini b/VAX/tests/EVKAA.ini
deleted file mode 100644
index 9f438357..00000000
--- a/VAX/tests/EVKAA.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-set -qu console telnet=65432,telnet=buffered
-load evkaa.exe
-expect "Hit any key to continue" send "\r"; go -q
-expect [2] "done!" echof "\r\n%SIM_NAME% Hardware Core Instruction test EVKAA - PASSED\n"; exit 0
-go -q 200
-echof "\r\n%SIM_NAME% Hardware Core Instruction test EVKAA - FAILED\n"
-exit 1
diff --git a/VAX/tests/microvax3900_test.ini b/VAX/tests/microvax3900_test.ini
deleted file mode 100644
index a2e532fb..00000000
--- a/VAX/tests/microvax3900_test.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-cd VAX/tests
-do VAX-DIAG.ini %1
diff --git a/VAX/tests/vax-diag.ini b/VAX/tests/vax-diag_test.ini
similarity index 88%
rename from VAX/tests/vax-diag.ini
rename to VAX/tests/vax-diag_test.ini
index e6c0987d..2a52259c 100644
--- a/VAX/tests/vax-diag.ini
+++ b/VAX/tests/vax-diag_test.ini
@@ -6,7 +6,9 @@
 :: if the script is invoked with -v as a parameter, verbose 
 :: diagnostic output will be produced.
 ::
-#echof "%%0=%0\n"
+:: The related diagnostic files must be located in the same directory 
+:: as this procedure.
+::
 #set clock async
 #set debug -ntp todr.dbg
 #set todr debug
@@ -15,6 +17,7 @@
 #set int-clock nodebug=queue;gettime;check
 #set cpu hist=20000
 #break A3B4 SHOW HIST=40
+cd %~p0
 set env DIAG_QUIET_MODE=0
 if ("%1" == "-v") set console notelnet
 else set -qu console telnet=65432,telnet=buffered; set env -a DIAG_QUIET_MODE=1
@@ -26,7 +29,7 @@ exit 0
 :DIAG_VAX
 :DIAG_MICROVAX3900
 echo Running Harware Core Test (EHKAA)
-if not exist ehkaa.exe echof "\r\nMISSING - Diagnostic ehkaa.exe is missing\n"; exit 1
+if not exist ehkaa.exe echof "\r\nMISSING - Diagnostic '%~p0ehkaa.exe' is missing\n"; exit 1
 load ehkaa.exe
 go -q 200
 if (PC != 0x80018AD1) echof "\r\n*** FAILED - %SIM_NAME% Hardware Core Instruction test EHKAA\n"; exit 1
@@ -37,7 +40,7 @@ else                  echof "\r\n*** PASSED - %SIM_NAME% Hardware Core Instructi
 :DIAG_VAX780
 :DIAG_VAX8600
 echo Running Harware Core Test (EVKAA)
-if not exist evkaa.exe echof "\r\nMISSING - Diagnostic evkaa.exe is missing\n"; exit 1
+if not exist evkaa.exe echof "\r\nMISSING - Diagnostic '%~p0evkaa.exe' is missing\n"; exit 1
 load evkaa.exe
 expect "Hit any key to continue" send "\r"; go -q
 expect [2] "done!" echof "\r\n*** PASSED - %SIM_NAME% Hardware Core Instruction test EVKAA\n"; goto extended_tests
@@ -48,7 +51,7 @@ exit 1
 :extended_tests
 reset -p
 if (DIAG_QUIET_MODE) echof "\nStarting VAX Diagnostic Supervisor\n"
-if not exist VAX_MINIMUM_DIAGS.dsk echof "\r\nMISSING - Diagnostic disk image VAX_MINIMUM_DIAGS.dsk is missing\n"; exit 1
+if not exist VAX_MINIMUM_DIAGS.dsk echof "\r\nMISSING - Diagnostic disk image '%~p0VAX_MINIMUM_DIAGS.dsk' is missing\n"; exit 1
 attach -rq rq0 VAX_MINIMUM_DIAGS.dsk
 goto %SIM_BIN_NAME%
 
diff --git a/VAX/tests/vax730_test.ini b/VAX/tests/vax730_test.ini
deleted file mode 100644
index a2e532fb..00000000
--- a/VAX/tests/vax730_test.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-cd VAX/tests
-do VAX-DIAG.ini %1
diff --git a/VAX/tests/vax750_test.ini b/VAX/tests/vax750_test.ini
deleted file mode 100644
index a2e532fb..00000000
--- a/VAX/tests/vax750_test.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-cd VAX/tests
-do VAX-DIAG.ini %1
diff --git a/VAX/tests/vax780_test.ini b/VAX/tests/vax780_test.ini
deleted file mode 100644
index a2e532fb..00000000
--- a/VAX/tests/vax780_test.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-cd VAX/tests
-do VAX-DIAG.ini %1
diff --git a/VAX/tests/vax8600_test.ini b/VAX/tests/vax8600_test.ini
deleted file mode 100644
index a2e532fb..00000000
--- a/VAX/tests/vax8600_test.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-cd VAX/tests
-do VAX-DIAG.ini %1
diff --git a/makefile b/makefile
index c6006840..7b739f95 100644
--- a/makefile
+++ b/makefile
@@ -1898,8 +1898,8 @@ ifeq ($(WIN32),)
 else
 	copy $(@D)\microvax3900${EXE} $(@D)\vax${EXE}
 endif
-ifneq (,$(call find_test,$(VAXD),microvax3900))
-	$@ $(call find_test,$(VAXD),microvax3900) $(TEST_ARG)
+ifneq (,$(call find_test,$(VAXD),vax-diag))
+	$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
 endif
 
 microvax1 : ${BIN}BuildROMs${EXE} ${BIN}microvax1${EXE}
@@ -1907,8 +1907,8 @@ microvax1 : ${BIN}BuildROMs${EXE} ${BIN}microvax1${EXE}
 ${BIN}microvax1${EXE} : ${VAX610} ${SIM} ${BUILD_ROMS}
 	${MKDIRBIN}
 	${CC} ${VAX610} ${SIM} ${VAX610_OPT} -o $@ ${LDFLAGS}
-ifneq (,$(call find_test,$(VAXD),microvax1))
-	$@ $(call find_test,$(VAXD),microvax1) $(TEST_ARG)
+ifneq (,$(call find_test,$(VAXD),vax-diag))
+	$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
 endif
 
 rtvax1000 : ${BIN}BuildROMs${EXE} ${BIN}rtvax1000${EXE}
@@ -1916,8 +1916,8 @@ rtvax1000 : ${BIN}BuildROMs${EXE} ${BIN}rtvax1000${EXE}
 ${BIN}rtvax1000${EXE} : ${VAX630} ${SIM} ${BUILD_ROMS}
 	${MKDIRBIN}
 	${CC} ${VAX630} ${SIM} ${VAX620_OPT} -o $@ ${LDFLAGS}
-ifneq (,$(call find_test,$(VAXD),rtvax1000))
-	$@ $(call find_test,$(VAXD),rtvax1000) $(TEST_ARG)
+ifneq (,$(call find_test,$(VAXD),vax-diag))
+	$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
 endif
 
 microvax2 : ${BIN}BuildROMs${EXE} ${BIN}microvax2${EXE}
@@ -1925,8 +1925,8 @@ microvax2 : ${BIN}BuildROMs${EXE} ${BIN}microvax2${EXE}
 ${BIN}microvax2${EXE} : ${VAX630} ${SIM} ${BUILD_ROMS}
 	${MKDIRBIN}
 	${CC} ${VAX630} ${SIM} ${VAX630_OPT} -o $@ ${LDFLAGS}
-ifneq (,$(call find_test,$(VAXD),microvax2))
-	$@ $(call find_test,$(VAXD),microvax2) $(TEST_ARG)
+ifneq (,$(call find_test,$(VAXD),vax-diag))
+	$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
 endif
 
 vax730 : ${BIN}BuildROMs${EXE} ${BIN}vax730${EXE}
@@ -1934,8 +1934,8 @@ vax730 : ${BIN}BuildROMs${EXE} ${BIN}vax730${EXE}
 ${BIN}vax730${EXE} : ${VAX730} ${SIM} ${BUILD_ROMS}
 	${MKDIRBIN}
 	${CC} ${VAX730} ${SIM} ${VAX730_OPT} -o $@ ${LDFLAGS}
-ifneq (,$(call find_test,$(VAXD),vax730))
-	$@ $(call find_test,$(VAXD),vax730) $(TEST_ARG)
+ifneq (,$(call find_test,$(VAXD),vax-diag))
+	$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
 endif
 
 vax750 : ${BIN}BuildROMs${EXE} ${BIN}vax750${EXE}
@@ -1943,8 +1943,8 @@ vax750 : ${BIN}BuildROMs${EXE} ${BIN}vax750${EXE}
 ${BIN}vax750${EXE} : ${VAX750} ${SIM} ${BUILD_ROMS}
 	${MKDIRBIN}
 	${CC} ${VAX750} ${SIM} ${VAX750_OPT} -o $@ ${LDFLAGS}
-ifneq (,$(call find_test,$(VAXD),vax750))
-	$@ $(call find_test,$(VAXD),vax750) $(TEST_ARG)
+ifneq (,$(call find_test,$(VAXD),vax-diag))
+	$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
 endif
 
 vax780 : ${BIN}BuildROMs${EXE} ${BIN}vax780${EXE}
@@ -1952,8 +1952,8 @@ vax780 : ${BIN}BuildROMs${EXE} ${BIN}vax780${EXE}
 ${BIN}vax780${EXE} : ${VAX780} ${SIM} ${BUILD_ROMS}
 	${MKDIRBIN}
 	${CC} ${VAX780} ${SIM} ${VAX780_OPT} $(CC_OUTSPEC) ${LDFLAGS}
-ifneq (,$(call find_test,$(VAXD),vax780))
-	$@ $(call find_test,$(VAXD),vax780) $(TEST_ARG)
+ifneq (,$(call find_test,$(VAXD),vax-diag))
+	$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
 endif
 
 vax8600 : ${BIN}BuildROMs${EXE} ${BIN}vax8600${EXE}
@@ -1961,8 +1961,8 @@ vax8600 : ${BIN}BuildROMs${EXE} ${BIN}vax8600${EXE}
 ${BIN}vax8600${EXE} : ${VAX8600} ${SIM} ${BUILD_ROMS}
 	${MKDIRBIN}
 	${CC} ${VAX8600} ${SIM} ${VAX8600_OPT} $(CC_OUTSPEC) ${LDFLAGS}
-ifneq (,$(call find_test,$(VAXD),vax8600))
-	$@ $(call find_test,$(VAXD),vax8600) $(TEST_ARG)
+ifneq (,$(call find_test,$(VAXD),vax-diag))
+	$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
 endif
 
 nova : ${BIN}nova${EXE}