diff --git a/test/run-tests.sh b/test/run-tests.sh
index d05640a5604c85041f467dddc5e9194b2fc5c858..97e7a9e9501d6d91995d21fb2582321edb58e39f 100755
--- a/test/run-tests.sh
+++ b/test/run-tests.sh
@@ -181,9 +181,9 @@ do_tests () {
 # not used currently but leave here for future reference.
 #
 case $(uname) in
-    CYGWIN*) os=windows ;;
-    Darwin) os=macos ;;
-    Linux) os=linux ;;
+    CYGWIN*|MSYS_NT*) os=windows ;;
+    Darwin*) os=macos ;;
+    Linux*) os=linux ;;
     *) os=unknown ;;
 esac
 
@@ -223,9 +223,9 @@ case "$lisp" in
     # echo ALLEGRO=$ALLEGRO
     flags="-q"
     nodebug="-batch"
-    if [ "$os" = windows ] && [ -z "$ALLEGRO_NOISY" ] ; then
+    if [ "$os" = windows ] ; then
         adir=$(dirname "${command}") ;
-        allegroName=$(basename "${command}") ;
+        allegroName=$(basename "${command}" ".exe") ;
         if [[ ${allegroName: -1} == "8" ]] ; then build=build ; else build=buildi ; fi ;
         # this takes somewhat unjustifiable advantage of the fact that
         # the Allegro images have the same name (with .dxl extension)
diff --git a/test/test-program.script b/test/test-program.script
index f7442742f26dd7c5889c130404e074ef1874851a..da366c80c56cc4fa3ac6189675ab803ed0a61dce 100644
--- a/test/test-program.script
+++ b/test/test-program.script
@@ -1,7 +1,8 @@
 ;;; -*- Lisp -*-
 (DBG :foo (current-lisp-file-pathname))
 
-(unless (or #+(or allegro (and clisp os-unix) clozure cmucl (and ecl (not ecl-bytecmp)) lispworks mkcl sbcl scl) t)
+(unless (or #+(or allegro (and clisp os-unix) clozure cmucl
+                  (and ecl (not ecl-bytecmp)) lispworks mkcl sbcl scl) t)
   (DBG "Creating images is not supported on your CL implementation")
   (leave-test "Skipping test" 0))
 
@@ -43,6 +44,7 @@
     (lisp-invocation:invoke-lisp
      :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant)
      :cross-compile nil
+     :console t
      :load (native-namestring (subpathname *test-directory* "make-hello-world.lisp"))
      :eval (format nil "(asdf-test::make-hello-~(~a~))" kind)
      :run-program-args
@@ -70,6 +72,7 @@
      :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant)
      :cross-compile nil
      :image-path (native-namestring img)
+     :console t
      :eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)"
      :run-program-args '(:output :lines :error-output t)))
    '("hello, world"))
@@ -81,6 +84,7 @@
     :implementation-type (lisp-invocation/allegro-variants:current-lisp-variant)
     :image-path (native-namestring img)
     :cross-compile nil
+    :console t
     :eval "(uiop:restore-image :entry-point 'hello:entry-point :lisp-interaction nil)"
     :arguments '("a" "b c" "d")
     :run-program-args '(:output :lines :error-output t))