1 files changed, 11 insertions, 1 deletions
diff --git a/tests/starttls.sh b/tests/starttls.sh
index b342d5e024..3742964f9c 100755
--- a/tests/starttls.sh
+++ b/tests/starttls.sh
@@ -21,10 +21,18 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 srcdir="${srcdir:-.}"
-SERV="${SERV:-../src/gnutls-serv${EXEEXT}} -q"
+SERV="${SERV:-../src/gnutls-serv${EXEEXT}}"
 CLI="${CLI:-../src/gnutls-cli${EXEEXT}}"
 unset RETCODE
 
+if ! test -x "${SERV}"; then
+	exit 77
+fi
+
+if ! test -x "${CLI}"; then
+	exit 77
+fi
+
 if test "${WINDIR}" != ""; then
 	exit 77
 fi 
@@ -52,6 +60,8 @@ then
 	exit 77
 fi
 
+SERV="${SERV} -q"
+
 . "${srcdir}/scripts/common.sh"
 
 echo "Checking STARTTLS"