diff --git a/VAX/tests/vax-diag_test.ini b/VAX/tests/vax-diag_test.ini
index a660714b..8936e077 100644
--- a/VAX/tests/vax-diag_test.ini
+++ b/VAX/tests/vax-diag_test.ini
@@ -18,7 +18,7 @@
 #set cpu hist=20000
 #break A3B4 SHOW HIST=40
 cd %~p0
-set runlimit 600M instructions
+set runlimit 2000M instructions
 set on
 on error ignore
 on runtime echof "\r\n*** Test Runtime Limit %SIM_RUNLIMIT% %SIM_RUNLIMIT_UNITS% Exceeded after running %SIM_RUNTIME% %SIM_RUNTIME_UNITS% ***\n"; exit 1
@@ -89,7 +89,7 @@ expect "DS> " send "ATTACH KA730 HUB KA0 no 0 0 2048 no no\r"; go -q
 expect "DS> " send "ATTACH DW730 HUB DW0\r"; go -q
 call Common
 call do_test EVKAB "VAX Basic Instructions Exerciser"
-call do_test EVKAC "VAX Floating Point Instructions Exerciser"
+call do_test EVKAC "VAX Floating Point Instructions Exerciser" /PASSES=2
 call do_test EVKAD "VAX Compatibility Mode Instructions Exerciser"
 #call do_test EVKAE "VAX Privileged Architecture Exerciser"
 echof "\n*** All Diagnostic Supervisor tests PASSED after running for %SIM_RUNTIME% %SIM_RUNTIME_UNITS% ***\n"
@@ -101,7 +101,7 @@ expect "DS> " send "ATTACH KA750 CMI KA0 yes yes yes 0 0\r"; go -q
 expect "DS> " send "ATTACH DW750 CMI DW0 8\r"; go -q
 call Common
 call do_test EVKAB "VAX Basic Instructions Exerciser"
-call do_test EVKAC "VAX Floating Point Instructions Exerciser"
+call do_test EVKAC "VAX Floating Point Instructions Exerciser" /PASSES=2
 call do_test EVKAD "VAX Compatibility Mode Instructions Exerciser"
 #call do_test EVKAE "VAX Privileged Architecture Exerciser"
 echof "\n*** All Diagnostic Supervisor tests PASSED after running for %SIM_RUNTIME% %SIM_RUNTIME_UNITS% ***\n"
@@ -113,7 +113,7 @@ expect "DS> " send "ATTACH KA780 SBI KA0 yes yes 0 0\r"; go -q
 expect "DS> " send "ATTACH DW780 SBI DW0 3 5\r"; go -q
 call Common
 call do_test EVKAB "VAX Basic Instructions Exerciser"
-call do_test EVKAC "VAX Floating Point Instructions Exerciser"
+call do_test EVKAC "VAX Floating Point Instructions Exerciser" /PASSES=2
 call do_test EVKAD "VAX Compatibility Mode Instructions Exerciser"
 #call do_test EVKAE "VAX Privileged Architecture Exerciser"
 echof "\n*** All Diagnostic Supervisor tests PASSED after running for %SIM_RUNTIME% %SIM_RUNTIME_UNITS% ***\n"
@@ -128,7 +128,7 @@ expect "DS> " send "ATTACH DWBUA HUB DW0 4 5\r"; go -q
 set runlimit 2000M instructions
 call Common 
 call do_test EVKAB "VAX Basic Instructions Exerciser"
-call do_test EVKAC "VAX Floating Point Instructions Exerciser"
+call do_test EVKAC "VAX Floating Point Instructions Exerciser" /PASSES=2
 #call do_test EVKAE "VAX Privileged Architecture Exerciser"
 echof "\n*** All Diagnostic Supervisor tests PASSED after running for %SIM_RUNTIME% %SIM_RUNTIME_UNITS% ***\n"
 exit 0
@@ -170,9 +170,13 @@ expect -r "Pass 1, test ([0-9][0-9]*), subtest ([0-9][0-9]*), error ([0-9][0-9]*
 expect -r "System fatal error while testing" go -q
 expect -r "\.\. End of run, ([0-9][0-9]*) (error|errors) detected, pass count is [0-9][0-9]*," set env -a DIAG_ERRORS=_EXPECT_MATCH_GROUP_1; go -q
 expect "DS> "
-if (DIAG_QUIET_MODE) echof "\nRunning - %DIAG_DESC% %DIAG_TEST%\n"
-send "RUN %DIAG_TEST%\r"
+if (DIAG_QUIET_MODE) echof "\nRunning - %DIAG_DESC% %DIAG_TEST% starting after %SIM_RUNTIME% %SIM_RUNTIME_UNITS%\n"
+send "RUN %DIAG_TEST%%3\r"
 go -q
-if (DIAG_ERRORS > 0) echof "\n*** FAILED - %DIAG_DESC% %DIAG_TEST% after running for %SIM_RUNTIME% %SIM_RUNTIME_UNITS%\n"; exit 1
+if (DIAG_ERRORS > 0) goto show_log
 if (DIAG_QUIET_MODE) echof "\n*** PASSED - %DIAG_DESC% %DIAG_TEST% after running for %SIM_RUNTIME% %SIM_RUNTIME_UNITS%\n"
 return
+:show_log
+if (DIAG_QUIET_MODE) set -q console telnet=log=diag_fail.log; set -q console telnet=nolog; type diag_fail.log;delete diag_fail.log
+echof "\n*** FAILED - %DIAG_DESC% %DIAG_TEST% after running for %SIM_RUNTIME% %SIM_RUNTIME_UNITS%\n"
+exit 1