diff --git a/lib/hx509/test_nist2.in b/lib/hx509/test_nist2.in
index 661612989..09390164c 100644
--- a/lib/hx509/test_nist2.in
+++ b/lib/hx509/test_nist2.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2004 - 2005 Kungliga Tekniska Högskolan
+# Copyright (c) 2004 - 2008 Kungliga Tekniska Högskolan
 # (Royal Institute of Technology, Stockholm, Sweden). 
 # All rights reserved. 
 #
@@ -55,6 +55,22 @@ if ${hxtool} info | grep 'rand: not available' > /dev/null ; then
     exit 77
 fi
 
+#--------- Try to find unzip
+
+oldifs=$IFS
+IFS=:
+set -- $PATH
+IFS=$oldifs
+found=
+
+for p in "$@" ; do
+    test -x "$p/unzip" && { found=1 ; break; }
+done
+test "X$found" = "X" && exit 77
+
+#---------
+
+
 echo "nist tests, version 2"
 
 if [ ! -d "$nistdir" ] ; then