diff --git a/security/nss/tests/all.sh b/security/nss/tests/all.sh
index 384c68bf148..746f845abc1 100755
--- a/security/nss/tests/all.sh
+++ b/security/nss/tests/all.sh
@@ -97,7 +97,7 @@ run_tests()
 	done
 }
 
-tests="cipher perf libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge"
+tests="cipher perf libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits"
 if [ -z "$BUILD_LIBPKIX_TESTS" ] ; then
 	tests=`echo "${tests}" | sed -e "s/libpkix//"`
 fi
diff --git a/security/nss/tests/pkits/pkits.sh b/security/nss/tests/pkits/pkits.sh
index 4aa311154b2..6988fae355f 100755
--- a/security/nss/tests/pkits/pkits.sh
+++ b/security/nss/tests/pkits/pkits.sh
@@ -72,6 +72,16 @@ pkits_init()
       . ./init.sh
   fi
 
+  if [ -z "${PKITS_DATA}" ]; then
+      echo "${SCRIPTNAME}: PKITS data directory not defined, skipping."
+      exit 0
+  fi      
+
+  if [ ! -d "${PKITS_DATA}" ]; then
+      echo "${SCRIPTNAME}: PKITS data directory ${PKITS_DATA} doesn't exist, skipping."
+      exit 0
+  fi
+
   PKITSDIR=${HOSTDIR}/pkits
 
   COPYDIR=${PKITSDIR}/copydir
@@ -80,12 +90,6 @@ pkits_init()
   mkdir -p ${COPYDIR}
   mkdir -p ${PKITSDIR}/html
 
-  if [ ! -d "${PKITS_DATA}" ]; then
-      PKITS_DATA=../../../../PKITS_DATA
-  fi
-
-  export PKITS_DATA
-
   certs=${PKITS_DATA}/certs
   crls=${PKITS_DATA}/crls