diff --git a/mozilla/security/nss/tests/libpkix/common/libpkix_init.sh b/mozilla/security/nss/tests/libpkix/common/libpkix_init.sh
index d619170061d..08aaa8c1291 100644
--- a/mozilla/security/nss/tests/libpkix/common/libpkix_init.sh
+++ b/mozilla/security/nss/tests/libpkix/common/libpkix_init.sh
@@ -56,6 +56,8 @@ doPD=0
 doTop=0
 doModule=0
 doPki=0
+doOCSP=0
+doOCSPTest=0
 
 combinedErrors=0
 totalErrors=0
@@ -111,6 +113,11 @@ Cleanup()
                 rm -f ${HOSTDIR}/rev_data/local/$i
             fi
         done
+        for i in ${localCRLFiles}; do
+            if [ -f ${HOSTDIR}/rev_data/local/$i ]; then
+                rm -f ${HOSTDIR}/rev_data/local/$i
+            fi
+        done
     fi
 
     if [ ${doPki} -eq 1 ]; then
@@ -221,6 +228,15 @@ RunTests()
         # If we want shorter command printout for NIST tests, delete next line
         testPurpose=${fullTestPurpose}
 
+        # Skip OCSP tests if OCSP is not defined in the environment
+        if [ ${doOCSPTest} -eq 0 ]; then
+            hasOCSP=`echo ${args} | grep OCSP-Test`
+            if [ ! -z "${hasOCSP}" ]; then
+                Display "SKIPPING ${testPgm} ${testPurpose}"
+	        continue
+	    fi
+        fi
+
         if [ ${doNIST} -eq 0 ]; then
             hasNIST=`echo ${args} | grep NIST-Test`
             if [ ! -z "${hasNIST}" ]; then
diff --git a/mozilla/security/nss/tests/libpkix/common/libpkix_init_nist.sh b/mozilla/security/nss/tests/libpkix/common/libpkix_init_nist.sh
index 3cd4b9740e2..71f7d09700b 100644
--- a/mozilla/security/nss/tests/libpkix/common/libpkix_init_nist.sh
+++ b/mozilla/security/nss/tests/libpkix/common/libpkix_init_nist.sh
@@ -40,18 +40,20 @@
 #
 
 #
-# Any test that use NIST files should have a tag of either NIST-Test or
-# NIST-Test-Files-Used at the command option so if there is no NIST files
+# Any test that uses NIST files should have a tag of either NIST-Test or
+# NIST-Test-Files-Used at the command option so if there are no NIST files
 # installed in the system, the test can be skipped
 #
 
 if [ -z "${NIST_FILES_DIR}" ] ; then
-    Display "\n*******************************************************************************"
+    Display ""
+    Display "*******************************************************************************"
     Display "The environment variable NIST_FILES_DIR is not defined. Therefore"
     Display "tests depending on it will be skipped. To enable these tests set"
     Display "NIST_FILES_DIR to the directory where NIST Certificates and CRLs"
     Display "are located." 
-    Display "*******************************************************************************\n"
+    Display "*******************************************************************************"
+    Display ""
     doNIST=0
 else
 
@@ -60,20 +62,41 @@ else
 fi
 
 #
-# Any test that use NIST Path Discovery files should have a tag of NIST-PDTest
-# at the command option so if there is no NIST Path Discovery files
+# Any tests that use NIST Path Discovery files should have a tag of NIST-PDTest
+# at the command option so if there are no NIST Path Discovery files
 # installed in the system, the test can be skipped
 #
 if [ ${doPD} -eq 1 -a -z "${PDVAL}" ] ; then
 
-    Display "\n*******************************************************************************"
+    Display ""
+    Display "*******************************************************************************"
     Display "The environment variable PDVAL is not defined. Therefore tests"
     Display "depending on it will be skipped. To enable these tests set PDVAL to"
     Display "the directory where NIST Path Discovery Certificates are located." 
-    Display "*******************************************************************************\n"
+    Display "*******************************************************************************"
+    Display ""
     doNIST_PDTest=0
 else
 
     NIST_PDTEST=${PDVAL}
     doNIST_PDTest=1
 fi
+
+#
+# Any tests that use an OCSP Server should have a tag of OCSP-Test at the
+# command option so if there is no OCSP Server installed in the system, the
+# test can be skipped
+#
+if [  ${doOCSP} -eq 1 -a -z "${OCSP}" ] ; then
+
+    Display ""
+    Display "*******************************************************************************"
+    Display "The environment variable OCSP is not defined. Therefore tests"
+    Display "depending on it will be skipped. To enable these tests set OCSP"
+    Display "non-NULL (the actual URI used is taken from the AIA extension)." 
+    Display "*******************************************************************************"
+    Display ""
+    doOCSPTest=0
+else
+    doOCSPTest=1
+fi