diff --git a/lib/hx509/test_nist.in b/lib/hx509/test_nist.in
index de730d262..118fabace 100644
--- a/lib/hx509/test_nist.in
+++ b/lib/hx509/test_nist.in
@@ -56,7 +56,7 @@ fi
 echo "nist tests"
 
 if [ ! -d "$nistdir" ] ; then
-    ( mkdir "$nistdir" &&  cd "$nistdir" && unzip "$nistzip" ) >/dev/null || \
+    ( mkdir "$nistdir" && unzip -d "${nistdir}" "${nistzip}" ) >/dev/null || \
 	{ rm -rf "$nistdir" ; exit 1; }
 fi