diff --git a/tests/Makefile.am b/tests/Makefile.am
index deee34cc..c75a9b70 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,7 @@ TESTS += ssh2.sh
 endif
 check_PROGRAMS = $(ctests)
 
-TESTS_ENVIRONMENT = SSHD=$(SSHD)
+TESTS_ENVIRONMENT = SSHD=$(SSHD) EXEEXT=$(EXEEXT)
 
 EXTRA_DIST = ssh2.sh
 EXTRA_DIST += etc/host etc/host.pub etc/user etc/user.pub
diff --git a/tests/ssh2.sh b/tests/ssh2.sh
index 3bf8c075..7cf941d6 100755
--- a/tests/ssh2.sh
+++ b/tests/ssh2.sh
@@ -6,10 +6,11 @@
 # return exit code.
 
 srcdir=${srcdir:-$PWD}
-srcdir=`cd $srcdir; pwd`
-cmd="./ssh2"
 SSHD=${SSHD:-/usr/sbin/sshd}
 
+cmd="./ssh2${EXEEXT}"
+srcdir=`cd $srcdir; pwd`
+
 PRIVKEY=$srcdir/etc/user
 export PRIVKEY
 PUBKEY=$srcdir/etc/user.pub